Changeset 290521 in webkit

Timestamp:

Feb 25, 2022 12:08:55 PM (2 years ago)

Author:

pvollan@apple.com

Message:

Make sure there is a default Networking process to provide the Launch Services database
​https://bugs.webkit.org/show_bug.cgi?id=236629

Reviewed by Brent Fulgham.

The WebContent processes relies on getting the Launch Services database from the Networking process.
It is possible to enter a state where there is no default Network process, but a Network process is
running because a Website data store is holding a reference to it. This patch addresses this issue
by removing Network process references in all remaining Website data stores when the last process
pool is being deleted.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::~WebProcessPool):

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::removeNetworkProcessReference):

• UIProcess/WebsiteData/WebsiteDataStore.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-25  Per Arne Vollan  <pvollan@apple.com>
+
+        Make sure there is a default Networking process to provide the Launch Services database
+        https://bugs.webkit.org/show_bug.cgi?id=236629
+
+        Reviewed by Brent Fulgham.
+
+        The WebContent processes relies on getting the Launch Services database from the Networking process.
+        It is possible to enter a state where there is no default Network process, but a Network process is
+        running because a Website data store is holding a reference to it. This patch addresses this issue
+        by removing Network process references in all remaining Website data stores when the last process
+        pool is being deleted.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::~WebProcessPool):
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::removeNetworkProcessReference):
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+
 2022-02-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -330 +330 @@
     }
 
-    if (processPools().isEmpty() && !!NetworkProcessProxy::defaultNetworkProcess())
-        NetworkProcessProxy::defaultNetworkProcess() = nullptr;
+    if (processPools().isEmpty()) {
+        WebsiteDataStore::forEachWebsiteDataStore([](auto& websiteDataStore) {
+            websiteDataStore.removeNetworkProcessReference();
+        });
+        if (auto& networkProcess = NetworkProcessProxy::defaultNetworkProcess()) {
+            ASSERT(networkProcess->hasOneRef());
+            networkProcess = nullptr;
+        }
+    }
 }
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -227 +227 @@
 }
 
+void WebsiteDataStore::removeNetworkProcessReference()
+{
+    m_networkProcess = nullptr;
+}
+
 void WebsiteDataStore::registerProcess(WebProcessProxy& process)
 {

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -126 +126 @@
     NetworkProcessProxy& networkProcess();
     NetworkProcessProxy* networkProcessIfExists() { return m_networkProcess.get(); }
-
+    void removeNetworkProcessReference();
+    
     static WebsiteDataStore* existingDataStoreForSessionID(PAL::SessionID);