Deprecate ServiceWorkerMessageEvent in favor of MessageEvent

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

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/MessagePort.h"
+#include "core/events/MessageEvent.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "modules/EventTargetModules.h"
 #include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
-#include "modules/serviceworkers/ServiceWorkerMessageEvent.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorker.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
@@ skipping 442 matching lines @@
     const WebString& message,
     const WebMessagePortChannelArray& webChannels) {
   if (!getExecutionContext() || !getExecutionContext()->executingWindow())
     return;
 
   MessagePortArray* ports =
       MessagePort::toMessagePortArray(getExecutionContext(), webChannels);
   RefPtr<SerializedScriptValue> value = SerializedScriptValue::create(message);
   ServiceWorker* source =
       ServiceWorker::from(getExecutionContext(), wrapUnique(handle.release()));
-  dispatchEvent(ServiceWorkerMessageEvent::create(
-      ports, value, source,
-      getExecutionContext()->getSecurityOrigin()->toString()));
+  dispatchEvent(MessageEvent::create(
+      ports, value, getExecutionContext()->getSecurityOrigin()->toString(),
+      String(), source, String()));

[nhiroki, 2016/11/14 05:48:55]

nit:

Adding arg names would be a bit more readable.

  String() /* lastEventId */, source, String() /* suborigin */));

[jungkees, 2016/11/14 14:17:11]

Yes. Addressed.

 }
 
 const AtomicString& ServiceWorkerContainer::interfaceName() const {
   return EventTargetNames::ServiceWorkerContainer;
 }
 
 ServiceWorkerContainer::ServiceWorkerContainer(
     ExecutionContext* executionContext)
     : ContextLifecycleObserver(executionContext), m_provider(0) {
   if (!executionContext)
     return;
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::from(executionContext)) {
     m_provider = client->provider();
     if (m_provider)
       m_provider->setClient(this);
   }
 }
 
 }  // namespace blink