Changeset 242050 in webkit

Timestamp:

Feb 25, 2019 11:11:57 AM (5 years ago)

Author:

pvollan@apple.com

Message:

A prewarmed Web process should have a process assertion.
​https://bugs.webkit.org/show_bug.cgi?id=195006

Reviewed by Geoffrey Garen.

To make sure the prewarm message is handled in the Web process before the process is suspended,
the process should have a process assertion. This can be fixed by sending the prewarm message
inside WebProcessPool::initializeNewWebProcess, since all message sent inside this method are
guaranteed to be handled before the WebContent process is suspended.

This patch is based on Chris Dumez' idea and obervation of the issue.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::initializeNewWebProcess):

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (3 diffs)
• UIProcess/WebProcessPool.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-25  Per Arne Vollan  <pvollan@apple.com>
+
+        A prewarmed Web process should have a process assertion.
+        https://bugs.webkit.org/show_bug.cgi?id=195006
+
+        Reviewed by Geoffrey Garen.
+
+        To make sure the prewarm message is handled in the Web process before the process is suspended,
+        the process should have a process assertion. This can be fixed by sending the prewarm message
+        inside WebProcessPool::initializeNewWebProcess, since all message sent inside this method are
+        guaranteed to be handled before the WebContent process is suspended.
+
+        This patch is based on Chris Dumez' idea and obervation of the issue.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createNewWebProcess):
+        (WebKit::WebProcessPool::initializeNewWebProcess):
+        * UIProcess/WebProcessPool.h:
+
 2019-02-25  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -765 +765 @@
     auto processProxy = WebProcessProxy::create(*this, websiteDataStore, isPrewarmed);
     auto& process = processProxy.get();
-    initializeNewWebProcess(process, websiteDataStore);
+    initializeNewWebProcess(process, websiteDataStore, isPrewarmed);
     m_processes.append(WTFMove(processProxy));
-    if (isPrewarmed == WebProcessProxy::IsPrewarmed::Yes) {
-        ASSERT(!m_prewarmedProcess);
-        m_prewarmedProcess = &process;
-        
-        m_prewarmedProcess->send(Messages::WebProcess::PrewarmGlobally(), 0);
-    }
 
     if (m_serviceWorkerProcessesTerminationTimer.isActive())
@@ -814 +808 @@
 #endif
 
-void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDataStore& websiteDataStore)
+void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDataStore& websiteDataStore, WebProcessProxy::IsPrewarmed isPrewarmed)
 {
     auto initializationActivityToken = process.throttler().backgroundActivityToken();
@@ -964 +958 @@
 
     ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
+
+    if (isPrewarmed == WebProcessProxy::IsPrewarmed::Yes) {
+        ASSERT(!m_prewarmedProcess);
+        m_prewarmedProcess = &process;
+        process.send(Messages::WebProcess::PrewarmGlobally(), 0);
+    }
 
 #if ENABLE(REMOTE_INSPECTOR)

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -506 +506 @@
 
     WebProcessProxy& createNewWebProcess(WebsiteDataStore&, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No);
-    void initializeNewWebProcess(WebProcessProxy&, WebsiteDataStore&);
+    void initializeNewWebProcess(WebProcessProxy&, WebsiteDataStore&, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No);
 
     void requestWebContentStatistics(StatisticsRequest&);