Changeset 229163 in webkit

Timestamp:

Mar 1, 2018 10:04:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

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

it is breaking imported/w3c/web-platform-tests/service-workers
/service-worker/clients-matchall-exact-controller.https.html
(Requested by youenn on #webkit).

Reverted changeset:

"Clients should register to StorageProcess with their service
worker registration identifier"
​https://bugs.webkit.org/show_bug.cgi?id=182313
​https://trac.webkit.org/changeset/229153

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/workers/service/SWClientConnection.h (modified) (1 diff)
• WebCore/workers/service/server/SWServer.cpp (modified) (6 diffs)
• WebCore/workers/service/server/SWServer.h (modified) (3 diffs)
• WebCore/workers/service/server/SWServerRegistration.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp (modified) (1 diff)
• WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h (modified) (1 diff)
• WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.messages.in (modified) (1 diff)
• WebKit/WebProcess/Storage/WebSWClientConnection.cpp (modified) (1 diff)
• WebKit/WebProcess/Storage/WebSWClientConnection.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-01  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r229153.
+        https://bugs.webkit.org/show_bug.cgi?id=183274
+
+        it is breaking imported/w3c/web-platform-tests/service-workers
+        /service-worker/clients-matchall-exact-controller.https.html
+        (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "Clients should register to StorageProcess with their service
+        worker registration identifier"
+        https://bugs.webkit.org/show_bug.cgi?id=182313
+        https://trac.webkit.org/changeset/229153
+
 2018-03-01  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -7744 +7744 @@
         return;
 
-    auto controllingServiceWorkerRegistrationIdentifier = activeServiceWorker() ? std::make_optional<ServiceWorkerRegistrationIdentifier>(activeServiceWorker()->registrationIdentifier()) : std::nullopt;
-    m_serviceWorkerConnection->registerServiceWorkerClient(topOrigin(), ServiceWorkerClientData::from(*this, *serviceWorkerConnection), controllingServiceWorkerRegistrationIdentifier);
+    auto controllingServiceWorkerIdentifier = activeServiceWorker() ? std::make_optional<ServiceWorkerIdentifier>(activeServiceWorker()->identifier()) : std::nullopt;
+    m_serviceWorkerConnection->registerServiceWorkerClient(topOrigin(), ServiceWorkerClientData::from(*this, *serviceWorkerConnection), controllingServiceWorkerIdentifier);
 }
 #endif

trunk/Source/WebCore/workers/service/SWClientConnection.h

@@ -81 +81 @@
     virtual void syncTerminateWorker(ServiceWorkerIdentifier) = 0;
 
-    virtual void registerServiceWorkerClient(const SecurityOrigin& topOrigin, const ServiceWorkerClientData&, const std::optional<ServiceWorkerRegistrationIdentifier>&) = 0;
+    virtual void registerServiceWorkerClient(const SecurityOrigin& topOrigin, const ServiceWorkerClientData&, const std::optional<ServiceWorkerIdentifier>&) = 0;
     virtual void unregisterServiceWorkerClient(DocumentIdentifier) = 0;
 

trunk/Source/WebCore/workers/service/server/SWServer.cpp

@@ -418 +418 @@
     Vector<ServiceWorkerClientData> matchingClients;
     forEachClientForOrigin(worker.origin(), [&](auto& clientData) {
-        if (!options.includeUncontrolled && worker.data().registrationIdentifier != m_clientToControllingRegistration.get(clientData.identifier))
+        if (!options.includeUncontrolled && worker.identifier() != m_clientToControllingWorker.get(clientData.identifier))
             return;
         if (options.type != ServiceWorkerClientType::All && options.type != clientData.type)
@@ -448 +448 @@
             return;
 
-        auto result = m_clientToControllingRegistration.add(clientData.identifier, registration->identifier());
+        auto result = m_clientToControllingWorker.add(clientData.identifier, worker.identifier());
         if (!result.isNewEntry) {
             auto previousIdentifier = result.iterator->value;
-            if (previousIdentifier == registration->identifier())
+            if (previousIdentifier == worker.identifier())
                 return;
-            result.iterator->value = registration->identifier();
-            if (auto* controllingRegistration = m_registrationsByID.get(previousIdentifier))
+            result.iterator->value = worker.identifier();
+            if (auto* controllingRegistration = this->registrationFromServiceWorkerIdentifier(previousIdentifier))
                 controllingRegistration->removeClientUsingRegistration(clientData.identifier);
         }
@@ -727 +727 @@
 }
 
+void SWServer::setClientActiveWorker(ServiceWorkerClientIdentifier clientIdentifier, ServiceWorkerIdentifier serviceWorkerIdentifier)
+{
+    m_clientToControllingWorker.set(clientIdentifier, serviceWorkerIdentifier);
+}
+
 SWServerRegistration* SWServer::registrationFromServiceWorkerIdentifier(ServiceWorkerIdentifier identifier)
 {
@@ -736 +741 @@
 }
 
-void SWServer::registerServiceWorkerClient(ClientOrigin&& clientOrigin, ServiceWorkerClientData&& data, const std::optional<ServiceWorkerRegistrationIdentifier>& controllingServiceWorkerRegistrationIdentifier)
+void SWServer::registerServiceWorkerClient(ClientOrigin&& clientOrigin, ServiceWorkerClientData&& data, const std::optional<ServiceWorkerIdentifier>& controllingServiceWorkerIdentifier)
 {
     auto clientIdentifier = data.identifier;
@@ -748 +753 @@
     clientIdentifiersForOrigin.terminateServiceWorkersTimer = nullptr;
 
-    if (!controllingServiceWorkerRegistrationIdentifier)
-        return;
-
-    auto* controllingRegistration = m_registrationsByID.get(*controllingServiceWorkerRegistrationIdentifier);
-    if (!controllingRegistration || !controllingRegistration->activeWorker())
-        return;
-
-    controllingRegistration->addClientUsingRegistration(clientIdentifier);
-    auto result = m_clientToControllingRegistration.add(clientIdentifier, *controllingServiceWorkerRegistrationIdentifier);
-    ASSERT_UNUSED(result, result.isNewEntry);
+    if (!controllingServiceWorkerIdentifier)
+        return;
+
+    if (auto* controllingRegistration = registrationFromServiceWorkerIdentifier(*controllingServiceWorkerIdentifier)) {
+        controllingRegistration->addClientUsingRegistration(clientIdentifier);
+        auto result = m_clientToControllingWorker.add(clientIdentifier, *controllingServiceWorkerIdentifier);
+        ASSERT_UNUSED(result, result.isNewEntry);
+    }
 }
 
@@ -784 +787 @@
     }
 
-    auto registrationIterator = m_clientToControllingRegistration.find(clientIdentifier);
-    if (registrationIterator == m_clientToControllingRegistration.end())
-        return;
-
-    if (auto* registration = m_registrationsByID.get(registrationIterator->value))
-        registration->removeClientUsingRegistration(clientIdentifier);
-
-    m_clientToControllingRegistration.remove(registrationIterator);
+    auto workerIterator = m_clientToControllingWorker.find(clientIdentifier);
+    if (workerIterator == m_clientToControllingWorker.end())
+        return;
+
+    if (auto* controllingRegistration = registrationFromServiceWorkerIdentifier(workerIterator->value))
+        controllingRegistration->removeClientUsingRegistration(clientIdentifier);
+
+    m_clientToControllingWorker.remove(workerIterator);
 }
 

trunk/Source/WebCore/workers/service/server/SWServer.h

@@ -162 +162 @@
     WEBCORE_EXPORT static HashSet<SWServer*>& allServers();
 
-    WEBCORE_EXPORT void registerServiceWorkerClient(ClientOrigin&&, ServiceWorkerClientData&&, const std::optional<ServiceWorkerRegistrationIdentifier>&);
+    WEBCORE_EXPORT void registerServiceWorkerClient(ClientOrigin&&, ServiceWorkerClientData&&, const std::optional<ServiceWorkerIdentifier>& controllingServiceWorkerIdentifier);
     WEBCORE_EXPORT void unregisterServiceWorkerClient(const ClientOrigin&, ServiceWorkerClientIdentifier);
 
@@ -168 +168 @@
     WEBCORE_EXPORT void runServiceWorkerIfNecessary(ServiceWorkerIdentifier, RunServiceWorkerCallback&&);
 
+    void setClientActiveWorker(ServiceWorkerClientIdentifier, ServiceWorkerIdentifier);
     void resolveRegistrationReadyRequests(SWServerRegistration&);
 
@@ -221 +222 @@
     HashMap<ClientOrigin, Clients> m_clientIdentifiersPerOrigin;
     HashMap<ServiceWorkerClientIdentifier, ServiceWorkerClientData> m_clientsById;
-    HashMap<ServiceWorkerClientIdentifier, ServiceWorkerRegistrationIdentifier> m_clientToControllingRegistration;
+    HashMap<ServiceWorkerClientIdentifier, ServiceWorkerIdentifier> m_clientToControllingWorker;
 
     UniqueRef<SWOriginStore> m_originStore;

trunk/Source/WebCore/workers/service/server/SWServerRegistration.cpp

@@ -308 +308 @@
     // For each service worker client who is using registration:
     // - Set client's active worker to registration's active worker.
-
+    for (auto keyValue : m_clientsUsingRegistration) {
+        for (auto& clientIdentifier : keyValue.value)
+            m_server.setClientActiveWorker(ServiceWorkerClientIdentifier { keyValue.key, clientIdentifier }, activeWorker()->identifier());
+    }
     // - Invoke Notify Controller Change algorithm with client as the argument.
     notifyClientsOfControllerChange();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-01  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r229153.
+        https://bugs.webkit.org/show_bug.cgi?id=183274
+
+        it is breaking imported/w3c/web-platform-tests/service-workers
+        /service-worker/clients-matchall-exact-controller.https.html
+        (Requested by youenn on #webkit).
+
+        Reverted changeset:
+
+        "Clients should register to StorageProcess with their service
+        worker registration identifier"
+        https://bugs.webkit.org/show_bug.cgi?id=182313
+        https://trac.webkit.org/changeset/229153
+
 2018-03-01  Brent Fulgham  <bfulgham@apple.com>
 

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

@@ -279 +279 @@
 }
 
-void WebSWServerConnection::registerServiceWorkerClient(SecurityOriginData&& topOrigin, ServiceWorkerClientData&& data, const std::optional<ServiceWorkerRegistrationIdentifier>& controllingServiceWorkerRegistrationIdentifier)
+void WebSWServerConnection::registerServiceWorkerClient(SecurityOriginData&& topOrigin, ServiceWorkerClientData&& data, const std::optional<ServiceWorkerIdentifier>& controllingServiceWorkerIdentifier)
 {
     auto clientOrigin = ClientOrigin { WTFMove(topOrigin), SecurityOriginData::fromSecurityOrigin(SecurityOrigin::create(data.url)) };
     m_clientOrigins.add(data.identifier, clientOrigin);
-    server().registerServiceWorkerClient(WTFMove(clientOrigin), WTFMove(data), controllingServiceWorkerRegistrationIdentifier);
+    server().registerServiceWorkerClient(WTFMove(clientOrigin), WTFMove(data), controllingServiceWorkerIdentifier);
 }
 

trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h

@@ -93 +93 @@
     void getRegistrations(uint64_t registrationMatchRequestIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::URL& clientURL);
 
-    void registerServiceWorkerClient(WebCore::SecurityOriginData&& topOrigin, WebCore::ServiceWorkerClientData&&, const std::optional<WebCore::ServiceWorkerRegistrationIdentifier>&);
+    void registerServiceWorkerClient(WebCore::SecurityOriginData&& topOrigin, WebCore::ServiceWorkerClientData&&, const std::optional<WebCore::ServiceWorkerIdentifier>&);
     void unregisterServiceWorkerClient(const WebCore::ServiceWorkerClientIdentifier&);
 

trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.messages.in

@@ -39 +39 @@
     WhenRegistrationReady(uint64_t serviceRegistrationMatchRequestIdentifier, struct WebCore::SecurityOriginData topOrigin, WebCore::URL clientURL)
     GetRegistrations(uint64_t serviceRegistrationMatchRequestIdentifier, struct WebCore::SecurityOriginData topOrigin, WebCore::URL clientURL)
-    RegisterServiceWorkerClient(struct WebCore::SecurityOriginData topOrigin, struct WebCore::ServiceWorkerClientData data, std::optional<WebCore::ServiceWorkerRegistrationIdentifier> controllingServiceWorkerRegistrationIdentifier)
+    RegisterServiceWorkerClient(struct WebCore::SecurityOriginData topOrigin, struct WebCore::ServiceWorkerClientData data, std::optional<WebCore::ServiceWorkerIdentifier> controllingServiceWorkerIdentifier)
     UnregisterServiceWorkerClient(struct WebCore::ServiceWorkerClientIdentifier identifier)
 

trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp

@@ -94 +94 @@
 }
 
-void WebSWClientConnection::registerServiceWorkerClient(const SecurityOrigin& topOrigin, const WebCore::ServiceWorkerClientData& data, const std::optional<WebCore::ServiceWorkerRegistrationIdentifier>& controllingServiceWorkerRegistrationIdentifier)
-{
-    send(Messages::WebSWServerConnection::RegisterServiceWorkerClient { SecurityOriginData::fromSecurityOrigin(topOrigin), data, controllingServiceWorkerRegistrationIdentifier });
+void WebSWClientConnection::registerServiceWorkerClient(const SecurityOrigin& topOrigin, const WebCore::ServiceWorkerClientData& data, const std::optional<WebCore::ServiceWorkerIdentifier>& controllingServiceWorkerIdentifier)
+{
+    send(Messages::WebSWServerConnection::RegisterServiceWorkerClient { SecurityOriginData::fromSecurityOrigin(topOrigin), data, controllingServiceWorkerIdentifier });
 }
 

trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.h

@@ -76 +76 @@
     void finishFetchingScriptInServer(const WebCore::ServiceWorkerFetchResult&) final;
     void postMessageToServiceWorker(WebCore::ServiceWorkerIdentifier destinationIdentifier, WebCore::MessageWithMessagePorts&&, const WebCore::ServiceWorkerOrClientIdentifier& source) final;
-    void registerServiceWorkerClient(const WebCore::SecurityOrigin& topOrigin, const WebCore::ServiceWorkerClientData&, const std::optional<WebCore::ServiceWorkerRegistrationIdentifier>&) final;
+    void registerServiceWorkerClient(const WebCore::SecurityOrigin& topOrigin, const WebCore::ServiceWorkerClientData&, const std::optional<WebCore::ServiceWorkerIdentifier>&) final;
     void unregisterServiceWorkerClient(WebCore::DocumentIdentifier) final;