Changeset 243379 in webkit

Timestamp:

Mar 22, 2019, 9:27:14 AM (7 years ago)

Author:

Chris Dumez

Message:

REGRESSION (r243094): ePub files do not render or open in Books
​https://bugs.webkit.org/show_bug.cgi?id=196119
<rdar://problem/49121686>

Reviewed by Brady Eidson.

Do not delay the WebProcess launch until a load when contructing a web view and the client
may observe when its injected bundle is loaded via WKProcessGroupDelegate's
didCreateConnectionToWebProcessPlugIn.

• UIProcess/API/Cocoa/WKProcessGroup.mm:

(-[WKProcessGroup setDelegate:]):

• UIProcess/WebInspectorUtilities.cpp:

(WebKit::inspectorProcessPool):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createWebPage):

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessGroup.mm (modified) (1 diff)
• UIProcess/WebInspectorUtilities.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-22  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r243094): ePub files do not render or open in Books
+        https://bugs.webkit.org/show_bug.cgi?id=196119
+        <rdar://problem/49121686>
+
+        Reviewed by Brady Eidson.
+
+        Do not delay the WebProcess launch until a load when contructing a web view and the client
+        may observe when its injected bundle is loaded via WKProcessGroupDelegate's
+        didCreateConnectionToWebProcessPlugIn.
+
+        * UIProcess/API/Cocoa/WKProcessGroup.mm:
+        (-[WKProcessGroup setDelegate:]):
+        * UIProcess/WebInspectorUtilities.cpp:
+        (WebKit::inspectorProcessPool):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createWebPage):
+        * UIProcess/WebProcessPool.h:
+
 2019-03-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm

@@ -216 +216 @@
 {
     _delegate = delegate;
+
+    // If the client can observe when the connection to the WebProcess injected bundle is established, then we cannot
+    // safely delay the launch of the WebProcess until something is loaded in the Web view.
+    if ([delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
+        _processPool->disableDelayedWebProcessLaunch();
 }
 

trunk/Source/WebKit/UIProcess/WebInspectorUtilities.cpp

@@ -83 +83 @@
         auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
         pool = &WebProcessPool::create(configuration.get()).leakRef();
+        // Do not delay process launch for inspector pages as inspector pages do not know how to transition from a terminated process.
+        pool->disableDelayedWebProcessLaunch();
     }
     return *pool;

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1219 +1219 @@
         ASSERT(process.get() == m_dummyProcessProxy || &pageConfiguration->websiteDataStore()->websiteDataStore() == &process->websiteDataStore());
         ASSERT(&pageConfiguration->relatedPage()->websiteDataStore() == &pageConfiguration->websiteDataStore()->websiteDataStore());
-    } else if (WebKit::isInspectorProcessPool(*this)) {
-        // Do not delay process launch for inspector pages as inspector pages do not know how to transition from a terminated process.
-        process = &processForRegistrableDomain(pageConfiguration->websiteDataStore()->websiteDataStore(), nullptr, { });
-    } else {
+    } else if (!m_isDelayedWebProcessLaunchDisabled) {
         // In the common case, we delay process launch until something is actually loaded in the page.
         if (!m_dummyProcessProxy) {
@@ -1230 +1227 @@
         }
         process = m_dummyProcessProxy;
-    }
+    } else
+        process = &processForRegistrableDomain(pageConfiguration->websiteDataStore()->websiteDataStore(), nullptr, { });
+
     ASSERT(process);
 

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -506 +506 @@
     void clearWebProcessHasUploads(WebCore::ProcessIdentifier);
 
+    void disableDelayedWebProcessLaunch() { m_isDelayedWebProcessLaunchDisabled = true; }
+
 private:
     void platformInitialize();
@@ -786 +788 @@
     HashMap<WebCore::ProcessIdentifier, std::unique_ptr<ProcessAssertion>> m_processesWithUploads;
     std::unique_ptr<ProcessAssertion> m_uiProcessUploadAssertion;
+    bool m_isDelayedWebProcessLaunchDisabled { false };
 };