Title: [149644] trunk/Source/WebKit2
- Revision
- 149644
- Author
- [email protected]
- Date
- 2013-05-06 15:33:15 -0700 (Mon, 06 May 2013)
Log Message
<rdar://problem/13775921> Switch off a deprecated API.
Reviewed by Oliver Hunt.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::setProcessSuppressionEnabled): When disabling process suppression,
begin an activity that doesn't disable idle sleep, sudden termination or automatic termination.
When enabling process suppression, end the activity.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149643 => 149644)
--- trunk/Source/WebKit2/ChangeLog 2013-05-06 21:43:15 UTC (rev 149643)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-06 22:33:15 UTC (rev 149644)
@@ -1,3 +1,14 @@
+2013-05-06 Mark Rowe <[email protected]>
+
+ <rdar://problem/13775921> Switch off a deprecated API.
+
+ Reviewed by Oliver Hunt.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::setProcessSuppressionEnabled): When disabling process suppression,
+ begin an activity that doesn't disable idle sleep, sudden termination or automatic termination.
+ When enabling process suppression, end the activity.
+
2013-05-06 Anders Carlsson <[email protected]>
Move local storage directory handling to LocalStorageDatabaseTracker
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (149643 => 149644)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-05-06 21:43:15 UTC (rev 149643)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-05-06 22:33:15 UTC (rev 149644)
@@ -65,13 +65,13 @@
if (this->processSuppressionEnabled() == processSuppressionEnabled)
return;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (processSuppressionEnabled)
+ if (processSuppressionEnabled) {
+ [[NSProcessInfo processInfo] endActivity:m_processSuppressionAssertion.get()];
m_processSuppressionAssertion.clear();
- else
- m_processSuppressionAssertion = [[NSProcessInfo processInfo] beginSuspensionOfSystemBehaviors:WKProcessSuppressionSystemBehaviors reason:@"Process Suppression Disabled"];
-#pragma clang diagnostic pop
+ } else {
+ NSActivityOptions options = NSActivityUserInitiatedAllowingIdleSystemSleep & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
+ m_processSuppressionAssertion = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Process Suppression Disabled"];
+ }
#else
UNUSED_PARAM(processSuppressionEnabled);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
