Changeset 147592 in webkit

Timestamp:

Apr 3, 2013 3:54:51 PM (11 years ago)

Author:

mrowe@apple.com

Message:

Enable process suppression when no windows in the application have drawn recently.
<​http://webkit.org/b/113854> / <rdar://problem/13540351>

Reviewed by Darin Adler.

• UIProcess/mac/WebContextMac.mm:

(WebKit::applicationWindowModificationsStarted): Note that modifications are no longer stopped.
(WebKit::applicationWindowModificationsStopped): Note that modifications have stopped.
(WebKit::registerOcclusionNotificationHandlers): Register handlers for the start and stop notifications.
(WebKit::unregisterOcclusionNotificationHandlers): Unregister handlers for the start and stop notifications.
(WebKit::WebContext::canEnableProcessSuppressionForNetworkProcess): Allow suppression if the application is occluded
or the application has not drawn recently.
(WebKit::WebContext::canEnableProcessSuppressionForWebProcess): Ditto.
(WebKit::WebContext::canEnableProcessSuppressionForGlobalChildProcesses): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-02  Mark Rowe  <mrowe@apple.com>
+
+        Enable process suppression when no windows in the application have drawn recently.
+        <http://webkit.org/b/113854> / <rdar://problem/13540351>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::applicationWindowModificationsStarted): Note that modifications are no longer stopped.
+        (WebKit::applicationWindowModificationsStopped): Note that modifications have stopped.
+        (WebKit::registerOcclusionNotificationHandlers): Register handlers for the start and stop notifications.
+        (WebKit::unregisterOcclusionNotificationHandlers): Unregister handlers for the start and stop notifications.
+        (WebKit::WebContext::canEnableProcessSuppressionForNetworkProcess): Allow suppression if the application is occluded
+        or the application has not drawn recently.
+        (WebKit::WebContext::canEnableProcessSuppressionForWebProcess): Ditto.
+        (WebKit::WebContext::canEnableProcessSuppressionForGlobalChildProcesses): Ditto.
+
 2013-04-03  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -67 +67 @@
 
 static bool s_applicationIsOccluded = false;
+static bool s_applicationWindowModificationsHaveStopped = false;
 static bool s_occlusionNotificationHandlersRegistered = false;
 static bool s_processSuppressionEnabledForAllContexts = true;
@@ -129 +130 @@
     applicationOcclusionStateChanged();
 }
+
+static void applicationWindowModificationsStarted(uint32_t, void*, uint32_t, void*, uint32_t)
+{
+    if (!s_applicationWindowModificationsHaveStopped)
+        return;
+    s_applicationWindowModificationsHaveStopped = false;
+    applicationOcclusionStateChanged();
+}
+
+static void applicationWindowModificationsStopped(uint32_t, void*, uint32_t, void*, uint32_t)
+{
+    if (s_applicationWindowModificationsHaveStopped)
+        return;
+    s_applicationWindowModificationsHaveStopped = true;
+    applicationOcclusionStateChanged();
+}
+
 #endif
 
@@ -139 +157 @@
     }
     
-    if (!WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationBecameOccluded, applicationBecameOccluded))
+    if (!WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationBecameOccluded, applicationBecameOccluded)) {
         WTFLogAlways("Registration of \"Application Became Occluded\" notification handler failed.\n");
+        return;
+    }
+
+    if (!WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationWindowModificationsStarted, applicationWindowModificationsStarted)) {
+        WTFLogAlways("Registration of \"Application Window Modifications Started\" notification handler failed.\n");
+        return;
+    }
+    
+    if (!WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationWindowModificationsStopped, applicationWindowModificationsStopped)) {
+        WTFLogAlways("Registration of \"Application Window Modifications Stopped\" notification handler failed.\n");
+        return;
+    }
 #endif
 }
@@ -152 +182 @@
     }
     
-    if (!WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationBecameOccluded, applicationBecameVisible))
+    if (!WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationBecameOccluded, applicationBecameVisible)) {
         WTFLogAlways("Unregistration of \"Application Became Visible\" notification handler failed.\n");
+        return;
+    }
+
+    if (!WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationWindowModificationsStarted, applicationWindowModificationsStarted)) {
+        WTFLogAlways("Unregistration of \"Application Window Modifications Started\" notification handler failed.\n");
+        return;
+    }
+    
+    if (!WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationTypeApplicationWindowModificationsStopped, applicationWindowModificationsStopped)) {
+        WTFLogAlways("Unregistration of \"Application Window Modifications Stopped\" notification handler failed.\n");
+        return;
+    }
 #endif
 }
@@ -447 +489 @@
 bool WebContext::canEnableProcessSuppressionForNetworkProcess() const
 {
-    return s_applicationIsOccluded && m_processSuppressionEnabled && !omitProcessSuppression();
+    return (s_applicationIsOccluded || s_applicationWindowModificationsHaveStopped) && m_processSuppressionEnabled && !omitProcessSuppression();
 }
 
 bool WebContext::canEnableProcessSuppressionForWebProcess(const WebKit::WebProcessProxy *webProcess) const
 {
-    return (s_applicationIsOccluded || webProcess->allPagesAreProcessSuppressible())
+    return (s_applicationIsOccluded || s_applicationWindowModificationsHaveStopped || webProcess->allPagesAreProcessSuppressible())
            && m_processSuppressionEnabled && !omitProcessSuppression();
 }
@@ -458 +500 @@
 bool WebContext::canEnableProcessSuppressionForGlobalChildProcesses()
 {
-    return s_applicationIsOccluded && s_processSuppressionEnabledForAllContexts && !omitProcessSuppression();
+    return (s_applicationIsOccluded || s_applicationWindowModificationsHaveStopped) && s_processSuppressionEnabledForAllContexts && !omitProcessSuppression();
 }