Changeset 223890 in webkit

Timestamp:

Oct 24, 2017 9:33:16 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERTION FAILED: !m_serviceWorkerManager in WebProcess::getWorkerContextConnection() on API tests
​https://bugs.webkit.org/show_bug.cgi?id=178586
<rdar://problem/35115902>

Patch by Youenn Fablet <​youenn@apple.com> on 2017-10-24
Reviewed by Brady Eidson.

Covered by API tests no longer crashing.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::getWorkerContextProcessConnection): Sending a worker context process connection message only at creation of the service worker process.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-24  Youenn Fablet  <youenn@apple.com>
+
+        ASSERTION FAILED: !m_serviceWorkerManager in WebProcess::getWorkerContextConnection() on API tests
+        https://bugs.webkit.org/show_bug.cgi?id=178586
+        <rdar://problem/35115902>
+
+        Reviewed by Brady Eidson.
+
+       Covered by API tests no longer crashing.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::getWorkerContextProcessConnection): Sending a worker context process connection message only at creation of the service worker process.
+
 2017-10-24  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -590 +590 @@
     ASSERT_UNUSED(proxy, &proxy == m_storageProcess);
     
-    if (!m_workerContextProcess) {
-        if (!m_websiteDataStore)
-            m_websiteDataStore = API::WebsiteDataStore::defaultDataStore().ptr();
-        auto& newProcess = createNewWebProcess(m_websiteDataStore->websiteDataStore());
-        m_workerContextProcess = &newProcess;
-    }
-    
+    if (m_workerContextProcess)
+        return;
+
+    if (!m_websiteDataStore)
+        m_websiteDataStore = API::WebsiteDataStore::defaultDataStore().ptr();
+    auto& newProcess = createNewWebProcess(m_websiteDataStore->websiteDataStore());
+    m_workerContextProcess = &newProcess;
     m_workerContextProcess->send(Messages::WebProcess::GetWorkerContextConnection(), 0);
 }