Changeset 252206 in webkit

Timestamp:

Nov 7, 2019 2:36:45 PM (4 years ago)

Author:

Chris Dumez

Message:

Port ServiceWorkerContainer to the HTML5 event loop
​https://bugs.webkit.org/show_bug.cgi?id=203963

Reviewed by Ryosuke Niwa.

• workers/service/ServiceWorkerContainer.cpp:

(WebCore::ServiceWorkerContainer::ServiceWorkerContainer):
(WebCore::ServiceWorkerContainer::startMessages):
(WebCore::ServiceWorkerContainer::postMessage):

• workers/service/ServiceWorkerContainer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/ServiceWorkerContainer.cpp (modified) (4 diffs)
• workers/service/ServiceWorkerContainer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-07  Chris Dumez  <cdumez@apple.com>
+
+        Port ServiceWorkerContainer to the HTML5 event loop
+        https://bugs.webkit.org/show_bug.cgi?id=203963
+
+        Reviewed by Ryosuke Niwa.
+
+        * workers/service/ServiceWorkerContainer.cpp:
+        (WebCore::ServiceWorkerContainer::ServiceWorkerContainer):
+        (WebCore::ServiceWorkerContainer::startMessages):
+        (WebCore::ServiceWorkerContainer::postMessage):
+        * workers/service/ServiceWorkerContainer.h:
+
 2019-11-06  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp

@@ -74 +74 @@
     : ActiveDOMObject(context)
     , m_navigator(navigator)
-    , m_messageQueue(GenericEventQueue::create(*this))
 {
     suspendIfNeeded();
@@ -80 +79 @@
     // We should queue messages until the DOMContentLoaded event has fired or startMessages() has been called.
     if (is<Document>(context) && downcast<Document>(*context).parsing())
-        m_messageQueue->setPaused(true);
+        m_shouldDeferMessageEvents = true;
 }
 
@@ -315 +314 @@
 void ServiceWorkerContainer::startMessages()
 {
-    m_messageQueue->setPaused(false);
+    m_shouldDeferMessageEvents = false;
+    auto deferredMessageEvents = WTFMove(m_deferredMessageEvents);
+    for (auto& messageEvent : deferredMessageEvents)
+        queueTaskToDispatchEvent(*this, TaskSource::DOMManipulation, WTFMove(messageEvent));
 }
 
@@ -405 +407 @@
 
     auto messageEvent = MessageEvent::create(MessagePort::entanglePorts(context, WTFMove(message.transferredPorts)), message.message.releaseNonNull(), sourceOrigin, { }, WTFMove(source));
-    
-    m_messageQueue->enqueueEvent(WTFMove(messageEvent));
+    if (m_shouldDeferMessageEvents)
+        m_deferredMessageEvents.append(WTFMove(messageEvent));
+    else {
+        ASSERT(m_deferredMessageEvents.isEmpty());
+        queueTaskToDispatchEvent(*this, TaskSource::DOMManipulation, WTFMove(messageEvent));
+    }
 }
 

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

@@ -30 +30 @@
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
-#include "GenericEventQueue.h"
 #include "IDLTypes.h"
 #include "SWClientConnection.h"
@@ -143 +142 @@
     uint64_t m_lastOngoingSettledRegistrationIdentifier { 0 };
     HashMap<uint64_t, ServiceWorkerRegistrationKey> m_ongoingSettledRegistrations;
-    UniqueRef<GenericEventQueue> m_messageQueue;
+    bool m_shouldDeferMessageEvents { false };
+    Vector<Ref<Event>> m_deferredMessageEvents;
 };