Changeset 149644 in webkit


Ignore:
Timestamp:
May 6, 2013 3:33:15 PM (11 years ago)
Author:
mrowe@apple.com
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.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r149643 r149644  
     12013-05-06  Mark Rowe  <mrowe@apple.com>
     2
     3        <rdar://problem/13775921> Switch off a deprecated API.
     4
     5        Reviewed by Oliver Hunt.
     6
     7        * Shared/mac/ChildProcessMac.mm:
     8        (WebKit::ChildProcess::setProcessSuppressionEnabled): When disabling process suppression,
     9        begin an activity that doesn't disable idle sleep, sudden termination or automatic termination.
     10        When enabling process suppression, end the activity.
     11
    1122013-05-06  Anders Carlsson  <andersca@apple.com>
    213
  • trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm

    r149441 r149644  
    6666        return;
    6767
    68 #pragma clang diagnostic push
    69 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    70     if (processSuppressionEnabled)
     68    if (processSuppressionEnabled) {
     69        [[NSProcessInfo processInfo] endActivity:m_processSuppressionAssertion.get()];
    7170        m_processSuppressionAssertion.clear();
    72     else
    73         m_processSuppressionAssertion = [[NSProcessInfo processInfo] beginSuspensionOfSystemBehaviors:WKProcessSuppressionSystemBehaviors reason:@"Process Suppression Disabled"];
    74 #pragma clang diagnostic pop
     71    } else {
     72        NSActivityOptions options = NSActivityUserInitiatedAllowingIdleSystemSleep & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
     73        m_processSuppressionAssertion = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Process Suppression Disabled"];
     74    }
    7575#else
    7676    UNUSED_PARAM(processSuppressionEnabled);
Note: See TracChangeset for help on using the changeset viewer.