Changeset 244984 in webkit

Timestamp:

May 6, 2019 3:47:26 PM (5 years ago)

Author:

Chris Dumez

Message:

Prewarmed WebContent processes never app nap
​https://bugs.webkit.org/show_bug.cgi?id=197630

Reviewed by Geoffrey Garen.

Do not require actually having a WebPage in the WebContent process to App Nap.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updateThrottleState):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-06  Chris Dumez  <cdumez@apple.com>
+
+        Prewarmed WebContent processes never app nap
+        https://bugs.webkit.org/show_bug.cgi?id=197630
+
+        Reviewed by Geoffrey Garen.
+
+        Do not require actually having a WebPage in the WebContent process to App Nap.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updateThrottleState):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2019-05-06  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -767 +767 @@
     bool pageSuppressed = m_processSuppressionEnabled && !isActive && isVisuallyIdle;
 
-#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
-    if (!pageSuppressed) {
-        // App nap must be manually enabled when not running the NSApplication run loop.
-        static std::once_flag onceKey;
-        std::call_once(onceKey, [] {
-            __CFRunLoopSetOptionsReason(__CFRunLoopOptionsEnableAppNap, CFSTR("Finished checkin as application - enable app nap"));
-        });
-    }
-#endif
     // The UserActivity keeps the processes runnable. So if the page should be suppressed, stop the activity.
     // If the page should not be supressed, start it.

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -200 +200 @@
 #endif
 
+#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    // App nap must be manually enabled when not running the NSApplication run loop.
+    __CFRunLoopSetOptionsReason(__CFRunLoopOptionsEnableAppNap, CFSTR("Finished checkin as application - enable app nap"));
+#endif
+
 #if TARGET_OS_IPHONE
     // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).