Set MessageEvent.source to the newly created port for shared workers' connect events

Source/core/dom/MessageEvent.h

 /*
  * Copyright (C) 2007 Henry Mason (hmason@mac.com)
  * Copyright (C) 2003, 2004, 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 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef MessageEvent_h
 #define MessageEvent_h
 
 #include "bindings/v8/SerializedScriptValue.h"
 #include "core/dom/Event.h"
+#include "core/dom/EventTarget.h"
 #include "core/dom/MessagePort.h"
 #include "core/fileapi/Blob.h"
 #include "core/page/DOMWindow.h"
 #include "wtf/ArrayBuffer.h"
 
 namespace WebCore {
 
-class DOMWindow;
-
 struct MessageEventInit : public EventInit {
     MessageEventInit();
 
     String origin;
     String lastEventId;
     RefPtr<DOMWindow> source;
     MessagePortArray ports;
 };
 
 class MessageEvent : public Event {
 public:
     static PassRefPtr<MessageEvent> create()
     {
         return adoptRef(new MessageEvent);
     }
+    static PassRefPtr<MessageEvent> create(PassOwnPtr<MessagePortArray> ports, PassRefPtr<MessagePort> source = 0)

[do-not-use, 2013/08/19 19:45:57]

This factory takes a MessagePort, the others take a DOMWindow. The constructor
is private. Therefore, we make sure that m_source is either a DOMWindow or a
MessagePort.

+    {
+        return adoptRef(new MessageEvent("", "", source, ports));
+    }
     static PassRefPtr<MessageEvent> create(PassOwnPtr<MessagePortArray> ports, const String& origin = "", const String& lastEventId = "", PassRefPtr<DOMWindow> source = 0)
     {
         return adoptRef(new MessageEvent(origin, lastEventId, source, ports));
     }
     static PassRefPtr<MessageEvent> create(PassOwnPtr<MessagePortArray> ports, PassRefPtr<SerializedScriptValue> data, const String& origin = "", const String& lastEventId = "", PassRefPtr<DOMWindow> source = 0)
     {
         return adoptRef(new MessageEvent(data, origin, lastEventId, source, ports));
     }
     static PassRefPtr<MessageEvent> create(const String& data, const String& origin = "")
     {
         return adoptRef(new MessageEvent(data, origin));
     }
     static PassRefPtr<MessageEvent> create(PassRefPtr<Blob> data, const String& origin = "")
     {
         return adoptRef(new MessageEvent(data, origin));
     }
     static PassRefPtr<MessageEvent> create(PassRefPtr<ArrayBuffer> data, const String& origin = "")
     {
         return adoptRef(new MessageEvent(data, origin));
     }
     static PassRefPtr<MessageEvent> create(const AtomicString& type, const MessageEventInit& initializer)

[abarth-chromium, 2013/08/19 20:01:51]

This constructor is the problematic one.  With your CL, I believe you can now
(incorrectly) construct a MessageEvent with a Node (or any other EventTarget)
using a DOM4-style constructor:

var evt = new MessageEvent({
  source: document.body,
  // etc...
});

     {
         return adoptRef(new MessageEvent(type, initializer));
     }
     virtual ~MessageEvent();
 
     void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& origin, const String& lastEventId, DOMWindow* source, PassOwnPtr<MessagePortArray>);
     void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, PassOwnPtr<MessagePortArray>);
 
     const String& origin() const { return m_origin; }
     const String& lastEventId() const { return m_lastEventId; }
-    DOMWindow* source() const { return m_source.get(); }
+    EventTarget* source() const { return m_source.get(); }
     MessagePortArray ports() const { return m_ports ? *m_ports : MessagePortArray(); }
 
     virtual const AtomicString& interfaceName() const;
 
     enum DataType {
         DataTypeScriptValue,
         DataTypeSerializedScriptValue,
         DataTypeString,
         DataTypeBlob,
         DataTypeArrayBuffer
     };
     DataType dataType() const { return m_dataType; }
     SerializedScriptValue* dataAsSerializedScriptValue() const { ASSERT(m_dataType == DataTypeScriptValue || m_dataType == DataTypeSerializedScriptValue); return m_dataAsSerializedScriptValue.get(); }
     String dataAsString() const { ASSERT(m_dataType == DataTypeString); return m_dataAsString; }
     Blob* dataAsBlob() const { ASSERT(m_dataType == DataTypeBlob); return m_dataAsBlob.get(); }
     ArrayBuffer* dataAsArrayBuffer() const { ASSERT(m_dataType == DataTypeArrayBuffer); return m_dataAsArrayBuffer.get(); }
 
     void setSerializedData(PassRefPtr<SerializedScriptValue> data)
     {
         ASSERT(!m_dataAsSerializedScriptValue);
         m_dataAsSerializedScriptValue = data;
     }
 
 private:
     MessageEvent();
     MessageEvent(const AtomicString&, const MessageEventInit&);
-    MessageEvent(const String& origin, const String& lastEventId, PassRefPtr<DOMWindow> source, PassOwnPtr<MessagePortArray>);
-    MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtr<DOMWindow> source, PassOwnPtr<MessagePortArray>);
+    MessageEvent(const String& origin, const String& lastEventId, PassRefPtr<EventTarget> source, PassOwnPtr<MessagePortArray>);
+    MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, PassRefPtr<EventTarget> source, PassOwnPtr<MessagePortArray>);
 
     explicit MessageEvent(const String& data, const String& origin);
     explicit MessageEvent(PassRefPtr<Blob> data, const String& origin);
     explicit MessageEvent(PassRefPtr<ArrayBuffer> data, const String& origin);
 
     DataType m_dataType;
     RefPtr<SerializedScriptValue> m_dataAsSerializedScriptValue;
     String m_dataAsString;
     RefPtr<Blob> m_dataAsBlob;
     RefPtr<ArrayBuffer> m_dataAsArrayBuffer;
     String m_origin;
     String m_lastEventId;
-    RefPtr<DOMWindow> m_source;
+    RefPtr<EventTarget> m_source; // A Window or a MessagePort.

[abarth-chromium, 2013/08/19 19:24:58]

Can we ASSERT this fact somewhere rather than having a comment?

[do-not-use, 2013/08/19 19:45:57]

Yes, I can add an assertion but this would mean adding a toMessagePort() virtual
function member to EventTarget (similarly to toDOMWindow()).

I actually did that at first and then decided to enforce that MessageEvent is
constructed using a DOMWindow / MessagePort using the factory functions as it
seemed a bit less intrusive. I am however happy to switch to a an assertion if
you prefer.

     OwnPtr<MessagePortArray> m_ports;
 };
 
 } // namespace WebCore
 
 #endif // MessageEvent_h