Changeset 256383 in webkit

Timestamp:

Feb 11, 2020 3:49:43 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r256314.
​https://bugs.webkit.org/show_bug.cgi?id=207594

It is breaking an API test (Requested by youenn on #webkit).

Reverted changeset:

"WebSWServerConnection::registerServiceWorkerClient is not
sending IPC message to UIProcess when it should"
​https://bugs.webkit.org/show_bug.cgi?id=207537
​https://trac.webkit.org/changeset/256314

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r256314.
+        https://bugs.webkit.org/show_bug.cgi?id=207594
+
+        It is breaking an API test (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "WebSWServerConnection::registerServiceWorkerClient is not
+        sending IPC message to UIProcess when it should"
+        https://bugs.webkit.org/show_bug.cgi?id=207537
+        https://trac.webkit.org/changeset/256314
+
 2020-02-11  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp

@@ -314 +314 @@
         return contextOrigin != origin.clientOrigin;
     });
-    auto* contextConnection = isNewOrigin ? server().contextConnectionForRegistrableDomain(RegistrableDomain { contextOrigin }) : nullptr;
 
     auto clientOrigin = ClientOrigin { WTFMove(topOrigin), WTFMove(contextOrigin) };
@@ -323 +322 @@
         updateThrottleState();
 
-    if (contextConnection) {
-        auto& connection = static_cast<WebSWServerToContextConnection&>(*contextConnection);
-        m_networkProcess->parentProcessConnection()->send(Messages::NetworkProcessProxy::RegisterServiceWorkerClientProcess { identifier(), connection.webProcessIdentifier() }, 0);
+    if (isNewOrigin) {
+        if (auto* contextConnection = server().contextConnectionForRegistrableDomain(RegistrableDomain { contextOrigin })) {
+            auto& connection = static_cast<WebSWServerToContextConnection&>(*contextConnection);
+            m_networkProcess->parentProcessConnection()->send(Messages::NetworkProcessProxy::RegisterServiceWorkerClientProcess { identifier(), connection.webProcessIdentifier() }, 0);
+        }
     }
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2020-02-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r256314.
+        https://bugs.webkit.org/show_bug.cgi?id=207594
+
+        It is breaking an API test (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "WebSWServerConnection::registerServiceWorkerClient is not
+        sending IPC message to UIProcess when it should"
+        https://bugs.webkit.org/show_bug.cgi?id=207537
+        https://trac.webkit.org/changeset/256314
+
 2020-02-11  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm

@@ -1677 +1677 @@
     waitUntilServiceWorkerProcessBackgroundActivityState(webView.get(), false);
     waitUntilServiceWorkerProcessForegroundActivityState(webView.get(), false);
-
-    [webView _setAssertionStateForTesting: 1];
-    waitUntilServiceWorkerProcessForegroundActivityState(webView.get(), false);
-    waitUntilServiceWorkerProcessBackgroundActivityState(webView.get(), true);
-
-    auto webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
-
-    [webView2 loadRequest:server.request()];
-    [webView2 _setAssertionStateForTesting: 3];
-
-    [webView _close];
-    webView = nullptr;
-
-    // The first webView is closed so the service worker process should take activity based on webView2.
-    waitUntilServiceWorkerProcessForegroundActivityState(webView2.get(), true);
-    waitUntilServiceWorkerProcessBackgroundActivityState(webView2.get(), false);
 }