Re-land: bindings: Use MessageEventInit for MessageEvent constructor

Source/core/events/MessageEvent.cpp

 /*
  * Copyright (C) 2007 Henry Mason (hmason@mac.com)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 
 namespace blink {
 
 static inline bool isValidSource(EventTarget* source)
 {
     return !source || source->toDOMWindow() || source->toMessagePort();
 }
 
-MessageEventInit::MessageEventInit()
-{
-}
-
 MessageEvent::MessageEvent()
     : m_dataType(DataTypeScriptValue)
 {
 }
 
 MessageEvent::MessageEvent(const AtomicString& type, const MessageEventInit& initializer)
     : Event(type, initializer)
     , m_dataType(DataTypeScriptValue)
-    , m_origin(initializer.origin)
-    , m_lastEventId(initializer.lastEventId)
-    , m_source(isValidSource(initializer.source.get()) ? initializer.source : nullptr)
-    , m_ports(adoptPtrWillBeNoop(new MessagePortArray(initializer.ports)))
+    , m_source(nullptr)
 {
+    if (initializer.hasData())
+        m_dataAsScriptValue = initializer.data();
+    if (initializer.hasOrigin())
+        m_origin = initializer.origin();
+    if (initializer.hasLastEventId())
+        m_lastEventId = initializer.lastEventId();
+    if (initializer.hasSource() && isValidSource(initializer.source().get()))
+        m_source = initializer.source();
+    if (initializer.hasPorts())
+        m_ports = adoptPtrWillBeNoop(new MessagePortArray(initializer.ports()));
     ASSERT(isValidSource(m_source.get()));
 }
 
 MessageEvent::MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtrWillBeRawPtr<MessagePortArray> ports)
     : Event(EventTypeNames::message, false, false)
     , m_dataType(DataTypeScriptValue)
     , m_origin(origin)
     , m_lastEventId(lastEventId)
     , m_source(source)
     , m_ports(ports)
@@ skipping 52 matching lines @@
     , m_origin(origin)
 {
 }
 
 MessageEvent::~MessageEvent()
 {
 }
 
 PassRefPtrWillBeRawPtr<MessageEvent> MessageEvent::create(const AtomicString& type, const MessageEventInit& initializer, ExceptionState& exceptionState)
 {
-    if (initializer.source.get() && !isValidSource(initializer.source.get())) {
+    if (initializer.source().get() && !isValidSource(initializer.source().get())) {
         exceptionState.throwTypeError("The optional 'source' property is neither a Window nor MessagePort.");
         return nullptr;
     }
     return adoptRefWillBeNoop(new MessageEvent(type, initializer));
 }
 
-void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& origin, const String& lastEventId, DOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray> ports)
+void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, ScriptValue data, const String& origin, const String& lastEventId, DOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray> ports)
 {
     if (dispatched())
         return;
 
     initEvent(type, canBubble, cancelable);
 
     m_dataType = DataTypeScriptValue;
+    m_dataAsScriptValue = data;
     m_origin = origin;
     m_lastEventId = lastEventId;
     m_source = source;
     m_ports = ports;
 }
 
 void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray> ports)
 {
     if (dispatched())
         return;
 
     initEvent(type, canBubble, cancelable);
 
     m_dataType = DataTypeSerializedScriptValue;
     m_dataAsSerializedScriptValue = data;
     m_origin = origin;
     m_lastEventId = lastEventId;
     m_source = source;
     m_ports = ports;
 
     if (m_dataAsSerializedScriptValue)
         m_dataAsSerializedScriptValue->registerMemoryAllocatedWithCurrentScriptContext();
 }
 
 const AtomicString& MessageEvent::interfaceName() const
 {
     return EventNames::MessageEvent;
 }
 
+MessagePortArray MessageEvent::ports(bool& isNull) const
+{
+    // TODO(bashi): Currently we return a copied array because the binding
+    // layer could modify the content of the array while executing JS callbacks.
+    // Avoid copying once we can make sure that the binding layer won't
+    // modify the content.
+    if (m_ports) {
+        isNull = false;
+        return *m_ports;
+    }
+    isNull = true;
+    return MessagePortArray();
+}
+
+MessagePortArray MessageEvent::ports() const
+{
+    bool unused;
+    return ports(unused);
+}
+
 void MessageEvent::entangleMessagePorts(ExecutionContext* context)
 {
     m_ports = MessagePort::entanglePorts(*context, m_channels.release());
 }
 
 DEFINE_TRACE(MessageEvent)
 {
     visitor->trace(m_dataAsBlob);
     visitor->trace(m_source);
 #if ENABLE(OILPAN)
@@ skipping 20 matching lines @@
         break;
     case MessageEvent::DataTypeArrayBuffer:
         V8HiddenValue::setHiddenValue(isolate, wrapper, V8HiddenValue::arrayBufferData(isolate), toV8(dataAsArrayBuffer(), wrapper, isolate));
         break;
     }
 
     return wrapper;
 }
 
 } // namespace blink