Title: [256383] trunk
Revision
256383
Author
commit-qu...@webkit.org
Date
2020-02-11 15:49:43 -0800 (Tue, 11 Feb 2020)

Log 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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (256382 => 256383)


--- trunk/Source/WebKit/ChangeLog	2020-02-11 23:42:44 UTC (rev 256382)
+++ trunk/Source/WebKit/ChangeLog	2020-02-11 23:49:43 UTC (rev 256383)
@@ -1,3 +1,17 @@
+2020-02-11  Commit Queue  <commit-qu...@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  <daba...@apple.com>
 
         Should not allow zooming to reveal focused element when suppressing selection assistant

Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (256382 => 256383)


--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	2020-02-11 23:42:44 UTC (rev 256382)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	2020-02-11 23:49:43 UTC (rev 256383)
@@ -313,7 +313,6 @@
     bool isNewOrigin = WTF::allOf(m_clientOrigins.values(), [&contextOrigin](auto& origin) {
         return contextOrigin != origin.clientOrigin;
     });
-    auto* contextConnection = isNewOrigin ? server().contextConnectionForRegistrableDomain(RegistrableDomain { contextOrigin }) : nullptr;
 
     auto clientOrigin = ClientOrigin { WTFMove(topOrigin), WTFMove(contextOrigin) };
     m_clientOrigins.add(data.identifier, clientOrigin);
@@ -322,9 +321,11 @@
     if (!m_isThrottleable)
         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);
+        }
     }
 }
 

Modified: trunk/Tools/ChangeLog (256382 => 256383)


--- trunk/Tools/ChangeLog	2020-02-11 23:42:44 UTC (rev 256382)
+++ trunk/Tools/ChangeLog	2020-02-11 23:49:43 UTC (rev 256383)
@@ -1,3 +1,17 @@
+2020-02-11  Commit Queue  <commit-qu...@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  <jbed...@apple.com>
 
         results.webkit.org: Configuration documentation should include architecture

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (256382 => 256383)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm	2020-02-11 23:42:44 UTC (rev 256382)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm	2020-02-11 23:49:43 UTC (rev 256383)
@@ -1676,22 +1676,6 @@
     [webView _setAssertionStateForTesting: 0];
     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);
 }
 
 TEST(ServiceWorkers, SuspendServiceWorkerProcessBasedOnClientProcesses)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to