ServiceWorker: Introduce ExtendableMessageEvent to replace MessageEvent

Source/web/ServiceWorkerGlobalScopeProxy.cpp

Index: Source/web/ServiceWorkerGlobalScopeProxy.cpp
diff --git a/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/Source/web/ServiceWorkerGlobalScopeProxy.cpp
index 288c100ca45b82a11eb761e744ef23bce2836d5b..722a601ab82669b005ef1ab1ea5cf4d148e0bfc3 100644
--- a/Source/web/ServiceWorkerGlobalScopeProxy.cpp
+++ b/Source/web/ServiceWorkerGlobalScopeProxy.cpp
@@ -51,8 +51,11 @@
 #include "modules/push_messaging/PushEvent.h"
 #include "modules/push_messaging/PushMessageData.h"
 #include "modules/serviceworkers/ExtendableEvent.h"
+#include "modules/serviceworkers/ExtendableMessageEvent.h"
 #include "modules/serviceworkers/FetchEvent.h"
+#include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
+#include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 #include "modules/serviceworkers/StashedMessagePort.h"
 #include "modules/serviceworkers/StashedPortCollection.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
@@ -128,13 +131,26 @@ void ServiceWorkerGlobalScopeProxy::dispatchInstallEvent(int eventID)
     m_workerGlobalScope->dispatchExtendableEvent(event.release(), observer);
 }
 
-void ServiceWorkerGlobalScopeProxy::dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray& webChannels)
+void ServiceWorkerGlobalScopeProxy::dispatchMessageEvent(int eventID, const WebServiceWorkerClientInfo& info, const WebString& message, const WebMessagePortChannelArray& webChannels)
 {
     ASSERT(m_workerGlobalScope);
+    WaitUntilObserver* observer = WaitUntilObserver::create(m_workerGlobalScope, WaitUntilObserver::Message, eventID);
+    OwnPtrWillBeRawPtr<MessagePortArray> ports = MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels);
+    WebSerializedScriptValue value = WebSerializedScriptValue::fromString(message);
+    ServiceWorkerClient* source = ServiceWorkerWindowClient::create(info);
+    RefPtrWillBeRawPtr<Event> event(ExtendableMessageEvent::create(ports.release(), value, source, observer));
+    m_workerGlobalScope->dispatchExtendableEvent(event.release(), observer);
+}
 
+void ServiceWorkerGlobalScopeProxy::dispatchMessageEvent(int eventID, WebServiceWorker* serviceWorker, const WebString& message, const WebMessagePortChannelArray& webChannels)
+{
+    ASSERT(m_workerGlobalScope);
+    WaitUntilObserver* observer = WaitUntilObserver::create(m_workerGlobalScope, WaitUntilObserver::Message, eventID);
     OwnPtrWillBeRawPtr<MessagePortArray> ports = MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels);
     WebSerializedScriptValue value = WebSerializedScriptValue::fromString(message);
-    m_workerGlobalScope->dispatchEvent(MessageEvent::create(ports.release(), value));
+    RefPtrWillBeRawPtr<ServiceWorker> source = ServiceWorker::from(m_workerGlobalScope->executionContext(), serviceWorker);
+    RefPtrWillBeRawPtr<Event> event(ExtendableMessageEvent::create(ports.release(), value, source.release(), observer));
+    m_workerGlobalScope->dispatchExtendableEvent(event.release(), observer);
 }
 
 void ServiceWorkerGlobalScopeProxy::dispatchNotificationClickEvent(int eventID, int64_t notificationID, const WebNotificationData& data)