Changeset 224000 in webkit

Timestamp:

Oct 25, 2017 7:57:08 PM (6 years ago)

Author:

Chris Dumez

Message:

messageEvent.source can also be a ServiceWorker
​https://bugs.webkit.org/show_bug.cgi?id=178839

Reviewed by Brady Eidson.

messageEvent.source can also be a ServiceWorker:

• ​https://html.spec.whatwg.org/multipage/comms.html#messageeventsource

This enables calling postMessage() from a ServiceWorker via Bug 178794.

• dom/MessageEvent.cpp:

(WebCore::MessageEvent::source const): Deleted.

• dom/MessageEvent.h:
• dom/MessageEvent.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MessageEvent.cpp (modified) (1 diff)
• dom/MessageEvent.h (modified) (3 diffs)
• dom/MessageEvent.idl (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-25  Chris Dumez  <cdumez@apple.com>
+
+        messageEvent.source can also be a ServiceWorker
+        https://bugs.webkit.org/show_bug.cgi?id=178839
+
+        Reviewed by Brady Eidson.
+
+        messageEvent.source can also be a ServiceWorker:
+        - https://html.spec.whatwg.org/multipage/comms.html#messageeventsource
+
+        This enables calling postMessage() from a ServiceWorker via Bug 178794.
+
+        * dom/MessageEvent.cpp:
+        (WebCore::MessageEvent::source const): Deleted.
+        * dom/MessageEvent.h:
+        * dom/MessageEvent.idl:
+
 2017-10-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/MessageEvent.cpp

@@ -151 +151 @@
 }
 
-EventTarget* MessageEvent::source() const
-{
-    if (!m_source)
-        return nullptr;
-
-    return WTF::switchOn(m_source.value(),
-        [] (const RefPtr<DOMWindow>& window) -> EventTarget* { return const_cast<DOMWindow*>(window.get()); },
-        [] (const RefPtr<MessagePort>& messagePort) -> EventTarget* { return const_cast<MessagePort*>(messagePort.get()); }
-    );
-}
-
 RefPtr<SerializedScriptValue> MessageEvent::trySerializeData(ExecState* exec)
 {

trunk/Source/WebCore/dom/MessageEvent.h

@@ -32 +32 @@
 #include "MessagePort.h"
 #include "SerializedScriptValue.h"
+#include "ServiceWorker.h"
 #include <bindings/ScriptValue.h>
 #include <wtf/Variant.h>
@@ -39 +40 @@
 class Blob;
 
+#if ENABLE(SERVICE_WORKER)
+using MessageEventSource = Variant<RefPtr<DOMWindow>, RefPtr<MessagePort>, RefPtr<ServiceWorker>>;
+#else
 using MessageEventSource = Variant<RefPtr<DOMWindow>, RefPtr<MessagePort>>;
+#endif
 
 class MessageEvent final : public Event {
@@ -65 +70 @@
     const String& origin() const { return m_origin; }
     const String& lastEventId() const { return m_lastEventId; }
-    EventTarget* source() const;
+    const std::optional<MessageEventSource>& source() const { return m_source; }
     const Vector<RefPtr<MessagePort>>& ports() const { return m_ports; }
 

trunk/Source/WebCore/dom/MessageEvent.idl

@@ -27 +27 @@
  */
 
+#if defined(ENABLE_SERVICE_WORKER) && ENABLE_SERVICE_WORKER
+typedef (DOMWindow or MessagePort or ServiceWorker) MessageEventSource;
+#else
+typedef (DOMWindow or MessagePort) MessageEventSource;
+#endif
+
 [
     Constructor(DOMString type, optional MessageEventInit eventInitDict),
@@ -34 +40 @@
     readonly attribute USVString origin;
     readonly attribute DOMString lastEventId;
-    readonly attribute EventTarget? source;
+    readonly attribute MessageEventSource? source;
     [CachedAttribute, CustomGetter] readonly attribute any data;
     readonly attribute FrozenArray<MessagePort> ports;
 
     [CallWith=ScriptState] void initMessageEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false,
-        optional any data = null, optional USVString originArg = "", optional DOMString lastEventId = "", optional (DOMWindow or MessagePort)? source = null,
+        optional any data = null, optional USVString originArg = "", optional DOMString lastEventId = "", optional MessageEventSource? source = null,
         optional sequence<MessagePort> messagePorts = []);
 };
@@ -47 +53 @@
       USVString origin = "";
       DOMString lastEventId = "";
-      (DOMWindow or MessagePort)? source = null;
+      MessageEventSource? source = null;
       sequence<MessagePort> ports = [];
 };