ServiceWorker: Implement attributes of ExtendableMessageEvent

third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp b/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp
index af432454b2338853b614dddda8163e90533ee65f..473416bcc47b9907f826c4981805d09d6ba62fc2 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ExtendableMessageEvent.cpp
@@ -21,6 +21,37 @@ PassRefPtrWillBeRawPtr<ExtendableMessageEvent> ExtendableMessageEvent::create(co
     return adoptRefWillBeNoop(new ExtendableMessageEvent(type, initializer, observer));
 }
 
+PassRefPtrWillBeRawPtr<ExtendableMessageEvent> ExtendableMessageEvent::create(PassRefPtr<SerializedScriptValue> data, const String& origin, PassOwnPtrWillBeRawPtr<MessagePortArray> ports, WaitUntilObserver* observer)
+{
+    return adoptRefWillBeNoop(new ExtendableMessageEvent(data, origin, ports, observer));
+}
+
+MessagePortArray ExtendableMessageEvent::ports(bool& isNull) const
+{
+    if (m_ports) {
+        isNull = false;
+        return *m_ports;
+    }
+    isNull = false;
+    return MessagePortArray();
+}
+
+MessagePortArray ExtendableMessageEvent::ports() const
+{
+    bool unused;
+    return ports(unused);
+}

[falken, 2016/02/05 02:28:52]

Ah, I see the ports() code came from MessageEvent.cpp. Maybe add a TODO in
ports(bool&) pointing to the one in MessageEvent.cpp?

[nhiroki, 2016/02/05 09:15:37]

Done (Just copied the comment from MessageEvent.cpp. Is this ok?).

[falken, 2016/02/05 09:58:18]

OK with me. I also noticed the snippet is in ServiceWorkerMessageEvent.cpp,
maybe good to copy there too.

[nhiroki, 2016/02/09 10:20:03]

Done.

+
+void ExtendableMessageEvent::source(ClientOrServiceWorkerOrMessagePort& result) const
+{
+    if (m_sourceAsClient)
+        result = ClientOrServiceWorkerOrMessagePort::fromClient(m_sourceAsClient);
+    else if (m_sourceAsServiceWorker)
+        result = ClientOrServiceWorkerOrMessagePort::fromServiceWorker(m_sourceAsServiceWorker);
+    else if (m_sourceAsMessagePort)
+        result = ClientOrServiceWorkerOrMessagePort::fromMessagePort(m_sourceAsMessagePort);

[falken, 2016/02/05 02:28:52]

else NOTREACHED?

[nhiroki, 2016/02/05 09:15:37]

I think the case actually happens when the event is manually created by the
ctor.

[falken, 2016/02/05 09:58:18]

Hm, I'm not sure how the bindings works but I'm worried about C++ that doesn't
set the result arg. What happens if the user says x = event.source()? I guess
the expected behavior is undefined or null?

[nhiroki, 2016/02/09 10:20:03]

According to the spec, null is the expected value:
https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html#ex...

It looks like the bindings layer creates |source| as a default union type that
represents 'null' in JS world [1], so technically we don't have to take care of
the case here. However, explicitly setting the null value would be more
understandable, so I added the "else" clause to handle the case. Let's wait for
bashi-san's comment :)

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/out/Debug/gen/blin...

+}
+
 const AtomicString& ExtendableMessageEvent::interfaceName() const
 {
     return EventNames::ExtendableMessageEvent;
@@ -28,6 +59,10 @@ const AtomicString& ExtendableMessageEvent::interfaceName() const
 
 DEFINE_TRACE(ExtendableMessageEvent)
 {
+    visitor->trace(m_sourceAsClient);
+    visitor->trace(m_sourceAsServiceWorker);
+    visitor->trace(m_sourceAsMessagePort);
+    visitor->trace(m_ports);
     ExtendableEvent::trace(visitor);
 }
 
@@ -43,7 +78,31 @@ ExtendableMessageEvent::ExtendableMessageEvent(const AtomicString& type, const E
 ExtendableMessageEvent::ExtendableMessageEvent(const AtomicString& type, const ExtendableMessageEventInit& initializer, WaitUntilObserver* observer)
     : ExtendableEvent(type, initializer, observer)
 {
-    // TODO(nhiroki): Set attributes (crbug.com/543198).
+    if (initializer.hasData())
+        m_data = initializer.data();
+    if (initializer.hasOrigin())
+        m_origin = initializer.origin();
+    if (initializer.hasSource()) {
+        if (initializer.source().isClient())
+            m_sourceAsClient = initializer.source().getAsClient();
+        else if (initializer.source().isServiceWorker())
+            m_sourceAsServiceWorker = initializer.source().getAsServiceWorker();
+        else if (initializer.source().isMessagePort())
+            m_sourceAsMessagePort = initializer.source().getAsMessagePort();
+    }
+    if (initializer.hasPorts())
+        m_ports = adoptRefWillBeNoop(new MessagePortArray(initializer.ports()));
+}
+
+ExtendableMessageEvent::ExtendableMessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, PassOwnPtrWillBeRawPtr<MessagePortArray> ports, WaitUntilObserver* observer)
+    : ExtendableEvent(EventTypeNames::message, ExtendableMessageEventInit(), observer)
+    , m_serializedData(data)
+    , m_origin(origin)
+    , m_lastEventId(String())
+    , m_ports(ports)
+{
+    if (m_serializedData)
+        m_serializedData->registerMemoryAllocatedWithCurrentScriptContext();
 }
 
 } // namespace blink