Title: [184795] branches/safari-601.1.32.2-branch/Source/WebKit2
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184794 => 184795)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 21:01:39 UTC (rev 184794)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 21:23:16 UTC (rev 184795)
@@ -1,5 +1,9 @@
2015-05-22 Babak Shafiei <[email protected]>
+ Build fix after r184774.
+
+2015-05-22 Babak Shafiei <[email protected]>
+
Merge r184774.
2015-05-21 Gavin Barraclough <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp (184794 => 184795)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-05-22 21:01:39 UTC (rev 184794)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-05-22 21:23:16 UTC (rev 184795)
@@ -57,7 +57,7 @@
m_suspendTimer.stop();
if (m_assertion) {
m_assertion->setState(assertionState());
- m_process.didSetAssertionState(assertionState());
+ m_process->didSetAssertionState(assertionState());
}
}
@@ -71,7 +71,7 @@
m_process->sendProcessWillSuspend();
m_suspendTimer.startOneShot(processSuspensionTimeout);
m_assertion->setState(AssertionState::Background);
- m_process.didSetAssertionState(AssertionState::Background);
+ m_process->didSetAssertionState(AssertionState::Background);
return;
}
@@ -91,7 +91,7 @@
{
m_suspendTimer.stop();
m_assertion = std::make_unique<ProcessAndUIAssertion>(pid, assertionState());
- m_process.didSetAssertionState(assertionState());
+ m_process->didSetAssertionState(assertionState());
}
void ProcessThrottler::suspendTimerFired()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes