Changeset 223713 in webkit

Timestamp:

Oct 19, 2017 2:31:17 PM (7 years ago)

Author:

Chris Dumez

Message:

Service Worker process should not be selected to open WebView on it
​https://bugs.webkit.org/show_bug.cgi?id=178527

Patch by Youenn Fablet <​youenn@apple.com> on 2017-10-19
Reviewed by Chris Dumez.

Selection of process to open a page will no longer use an existing web process if it is the service worker process.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-19  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker process should not be selected to open WebView on it
+        https://bugs.webkit.org/show_bug.cgi?id=178527
+
+        Reviewed by Chris Dumez.
+
+        Selection of process to open a page will no longer use an existing web process if it is the service worker process.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):
+
 2017-10-19  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -938 +938 @@
         return createNewWebProcess(websiteDataStore);
 
-    Vector<RefPtr<WebProcessProxy>> processesMatchingDataStore;
-    if (mustMatchDataStore) {
-        for (auto& process : m_processes) {
-            if (&process->websiteDataStore() == &websiteDataStore)
-                processesMatchingDataStore.append(process);
-        }
-
-        if (processesMatchingDataStore.isEmpty())
-            return createNewWebProcess(websiteDataStore);
-    }
-
-    // Choose the process with fewest pages.
-    auto* processes = mustMatchDataStore ? &processesMatchingDataStore : &m_processes;
-    ASSERT(!processes->isEmpty());
-    auto& process = *std::min_element(processes->begin(), processes->end(), [](const RefPtr<WebProcessProxy>& a, const RefPtr<WebProcessProxy>& b) {
-        return a->pageCount() < b->pageCount();
-    });
-
-    return *process;
+    WebProcessProxy* processToReuse = nullptr;
+    for (auto& process : m_processes) {
+        if (mustMatchDataStore && &process->websiteDataStore() != &websiteDataStore)
+            continue;
+#if ENABLE(SERVICE_WORKER)
+        if (process.get() == m_workerContextProcess)
+            continue;
+#endif
+        // Choose the process with fewest pages.
+        if (!processToReuse || processToReuse->pageCount() > process->pageCount())
+            processToReuse = process.get();
+    }
+    return processToReuse ? *processToReuse : createNewWebProcess(websiteDataStore);
 }