Changeset 252209 in webkit

Timestamp:

Nov 7, 2019 3:16:07 PM (4 years ago)

Author:

Chris Dumez

Message:

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

Reviewed by Ryosuke Niwa.

• dom/MessagePort.cpp:

(WebCore::MessagePort::MessagePort):
(WebCore::MessagePort::close):
(WebCore::MessagePort::dispatchMessages):
(WebCore::MessagePort::dispatchEvent):

• dom/MessagePort.h:
• dom/TaskSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MessagePort.cpp (modified) (3 diffs)
• dom/MessagePort.h (modified) (3 diffs)
• dom/TaskSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-07  Chris Dumez  <cdumez@apple.com>
+
+        Port MessagePort to the HTML5 event loop
+        https://bugs.webkit.org/show_bug.cgi?id=203960
+
+        Reviewed by Ryosuke Niwa.
+
+        * dom/MessagePort.cpp:
+        (WebCore::MessagePort::MessagePort):
+        (WebCore::MessagePort::close):
+        (WebCore::MessagePort::dispatchMessages):
+        (WebCore::MessagePort::dispatchEvent):
+        * dom/MessagePort.h:
+        * dom/TaskSource.h:
+
 2019-11-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/MessagePort.cpp

@@ -99 +99 @@
     , m_identifier(local)
     , m_remoteIdentifier(remote)
-    , m_eventQueue(GenericEventQueue::create(*this))
 {
     LOG(MessagePorts, "Created MessagePort %s (%p) in process %" PRIu64, m_identifier.logString().utf8().data(), this, Process::identifier().toUInt64());
@@ -236 +235 @@
 
     removeAllEventListeners();
-    m_eventQueue->close();
 }
 
@@ -278 +276 @@
                 return;
             auto ports = MessagePort::entanglePorts(*m_scriptExecutionContext, WTFMove(message.transferredPorts));
-            m_eventQueue->enqueueEvent(MessageEvent::create(WTFMove(ports), message.message.releaseNonNull()));
+            // Per specification, each MessagePort object has a task source called the port message queue.
+            queueTaskToDispatchEvent(*this, TaskSource::PostedMessageQueue, MessageEvent::create(WTFMove(ports), message.message.releaseNonNull()));
         }
     };
 
     MessagePortChannelProvider::fromContext(*m_scriptExecutionContext).takeAllMessagesForPort(m_identifier, WTFMove(messagesTakenHandler));
+}
+
+void MessagePort::dispatchEvent(Event& event)
+{
+    if (m_closed)
+        return;
+
+    EventTarget::dispatchEvent(event);
 }
 

trunk/Source/WebCore/dom/MessagePort.h

@@ -30 +30 @@
 #include "EventTarget.h"
 #include "ExceptionOr.h"
-#include "GenericEventQueue.h"
 #include "MessagePortChannel.h"
 #include "MessagePortIdentifier.h"
@@ -97 +96 @@
     void derefEventTarget() final { deref(); }
 
+    void dispatchEvent(Event&) final;
+
 private:
     explicit MessagePort(ScriptExecutionContext&, const MessagePortIdentifier& local, const MessagePortIdentifier& remote);
@@ -127 +128 @@
 
     mutable std::atomic<unsigned> m_refCount { 1 };
-    UniqueRef<GenericEventQueue> m_eventQueue;
 };
 

trunk/Source/WebCore/dom/TaskSource.h

@@ -34 +34 @@
     IdleTask,
     Networking,
+    PostedMessageQueue,
     UserInteraction
 };