Title: [256955] branches/safari-609.1.20.0-branch
- Revision
- 256955
- Author
- alanc...@apple.com
- Date
- 2020-02-19 15:07:42 -0800 (Wed, 19 Feb 2020)
Log Message
Cherry-pick r256383. rdar://problem/59446974
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
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.1.20.0-branch/Source/WebKit/ChangeLog (256954 => 256955)
--- branches/safari-609.1.20.0-branch/Source/WebKit/ChangeLog 2020-02-19 23:07:39 UTC (rev 256954)
+++ branches/safari-609.1.20.0-branch/Source/WebKit/ChangeLog 2020-02-19 23:07:42 UTC (rev 256955)
@@ -1,5 +1,37 @@
2020-02-19 Russell Epstein <repst...@apple.com>
+ Cherry-pick r256383. rdar://problem/59446974
+
+ 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
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-19 Russell Epstein <repst...@apple.com>
+
Cherry-pick r256314. rdar://problem/59446974
WebSWServerConnection::registerServiceWorkerClient is not sending IPC message to UIProcess when it should
Modified: branches/safari-609.1.20.0-branch/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (256954 => 256955)
--- branches/safari-609.1.20.0-branch/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp 2020-02-19 23:07:39 UTC (rev 256954)
+++ branches/safari-609.1.20.0-branch/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp 2020-02-19 23:07:42 UTC (rev 256955)
@@ -319,7 +319,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);
@@ -328,9 +327,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: branches/safari-609.1.20.0-branch/Tools/ChangeLog (256954 => 256955)
--- branches/safari-609.1.20.0-branch/Tools/ChangeLog 2020-02-19 23:07:39 UTC (rev 256954)
+++ branches/safari-609.1.20.0-branch/Tools/ChangeLog 2020-02-19 23:07:42 UTC (rev 256955)
@@ -1,5 +1,37 @@
2020-02-19 Russell Epstein <repst...@apple.com>
+ Cherry-pick r256383. rdar://problem/59446974
+
+ 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
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-19 Russell Epstein <repst...@apple.com>
+
Cherry-pick r256314. rdar://problem/59446974
WebSWServerConnection::registerServiceWorkerClient is not sending IPC message to UIProcess when it should
Modified: branches/safari-609.1.20.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (256954 => 256955)
--- branches/safari-609.1.20.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-02-19 23:07:39 UTC (rev 256954)
+++ branches/safari-609.1.20.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-02-19 23:07:42 UTC (rev 256955)
@@ -1677,22 +1677,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
