| Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| index 90d9d1985f8ba610e96a28e2f104143bc59563b5..04cf53ead9890d5af5bf1138db68e208d7c6cac1 100644
|
| --- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| +++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| @@ -35,7 +35,6 @@
|
| #include "core/dom/Document.h"
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/dom/MessagePort.h"
|
| -#include "core/events/MessageEvent.h"
|
| #include "core/inspector/ConsoleMessage.h"
|
| #include "core/workers/WorkerGlobalScope.h"
|
| #include "core/workers/WorkerThread.h"
|
| @@ -103,8 +102,6 @@ void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID)
|
|
|
| void ServiceWorkerGlobalScopeProxy::dispatchExtendableMessageEvent(int eventID, const WebString& message, const WebSecurityOrigin& sourceOrigin, const WebMessagePortChannelArray& webChannels, const WebServiceWorkerClientInfo& client)
|
| {
|
| - DCHECK(RuntimeEnabledFeatures::serviceWorkerExtendableMessageEventEnabled());
|
| -
|
| WebSerializedScriptValue value = WebSerializedScriptValue::fromString(message);
|
| MessagePortArray* ports = MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels);
|
| String origin;
|
| @@ -123,8 +120,6 @@ void ServiceWorkerGlobalScopeProxy::dispatchExtendableMessageEvent(int eventID,
|
|
|
| void ServiceWorkerGlobalScopeProxy::dispatchExtendableMessageEvent(int eventID, const WebString& message, const WebSecurityOrigin& sourceOrigin, const WebMessagePortChannelArray& webChannels, std::unique_ptr<WebServiceWorker::Handle> handle)
|
| {
|
| - DCHECK(RuntimeEnabledFeatures::serviceWorkerExtendableMessageEventEnabled());
|
| -
|
| WebSerializedScriptValue value = WebSerializedScriptValue::fromString(message);
|
| MessagePortArray* ports = MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels);
|
| String origin;
|
| @@ -182,13 +177,6 @@ void ServiceWorkerGlobalScopeProxy::dispatchInstallEvent(int eventID)
|
| workerGlobalScope()->dispatchExtendableEvent(event, observer);
|
| }
|
|
|
| -void ServiceWorkerGlobalScopeProxy::dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray& webChannels)
|
| -{
|
| - MessagePortArray* ports = MessagePort::toMessagePortArray(workerGlobalScope(), webChannels);
|
| - WebSerializedScriptValue value = WebSerializedScriptValue::fromString(message);
|
| - workerGlobalScope()->dispatchEvent(MessageEvent::create(ports, value));
|
| -}
|
| -
|
| void ServiceWorkerGlobalScopeProxy::dispatchNotificationClickEvent(int eventID, int64_t notificationID, const WebNotificationData& data, int actionIndex)
|
| {
|
| WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(), WaitUntilObserver::NotificationClick, eventID);
|
|
|