Changeset 227967 in webkit

Timestamp:

Feb 1, 2018 9:10:18 AM (6 years ago)

Author:

Chris Dumez

Message:

We no longer need to queue service worker jobs until the connection to the service worker process has been established
​https://bugs.webkit.org/show_bug.cgi?id=182375

Reviewed by Youenn Fablet.

We no longer need to queue service worker jobs until the connection to the service worker process
has been established. We initially did this to work around the fact that registrations restored
from disk would not have an active worker until the service worker process had been established.
However, this issue has been fixed in r227696.

This is basically a revert of r227220, which is no longer needed after r227696.

No new tests, initial fix was covered by an API test that still passes.

• workers/service/server/SWServer.cpp:

(WebCore::SWServer::clearAll):
(WebCore::SWServer::clear):
(WebCore::SWServer::scheduleJob):
(WebCore::SWServer::serverToContextConnectionCreated):

• workers/service/server/SWServer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/SWServer.cpp (modified) (4 diffs)
• workers/service/server/SWServer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-01  Chris Dumez  <cdumez@apple.com>
+
+        We no longer need to queue service worker jobs until the connection to the service worker process has been established
+        https://bugs.webkit.org/show_bug.cgi?id=182375
+
+        Reviewed by Youenn Fablet.
+
+        We no longer need to queue service worker jobs until the connection to the service worker process
+        has been established. We initially did this to work around the fact that registrations restored
+        from disk would not have an active worker until the service worker process had been established. 
+        However, this issue has been fixed in r227696.
+
+        This is basically a revert of r227220, which is no longer needed after r227696.
+
+        No new tests, initial fix was covered by an API test that still passes.
+
+        * workers/service/server/SWServer.cpp:
+        (WebCore::SWServer::clearAll):
+        (WebCore::SWServer::clear):
+        (WebCore::SWServer::scheduleJob):
+        (WebCore::SWServer::serverToContextConnectionCreated):
+        * workers/service/server/SWServer.h:
+
 2018-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -190 +190 @@
     ASSERT(m_registrationsByID.isEmpty());
     m_pendingContextDatas.clear();
-    m_pendingJobs.clear();
     m_originStore->clearAll();
     m_registrationStore.clearAll(WTFMove(completionHandler));
@@ -211 +210 @@
     });
 
-    m_pendingJobs.removeAllMatching([&](auto& job) {
-        return job.registrationKey().relatesToOrigin(origin);
-    });
-
     // Calling SWServerRegistration::clear() takes care of updating m_registrations, m_originStore and m_registrationStore.
     for (auto* registration : registrationsToRemove)
@@ -269 +264 @@
 {
     ASSERT(m_connections.contains(jobData.connectionIdentifier()));
-
-    if (!SWServerToContextConnection::globalServerToContextConnection()) {
-        m_pendingJobs.append(WTFMove(jobData));
-        return;
-    }
 
     // FIXME: Per the spec, check if this job is equivalent to the last job on the queue.
@@ -495 +485 @@
             callback(success, *connection);
     }
-
-    auto pendingJobs = WTFMove(m_pendingJobs);
-    for (auto& jobData : pendingJobs)
-        scheduleJob(WTFMove(jobData));
 }
 

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

@@ -224 +224 @@
     RegistrationStore m_registrationStore;
     Vector<ServiceWorkerContextData> m_pendingContextDatas;
-    Vector<ServiceWorkerJobData> m_pendingJobs;
     HashMap<ServiceWorkerIdentifier, Vector<RunServiceWorkerCallback>> m_serviceWorkerRunRequests;
     PAL::SessionID m_sessionID;