ServiceWorker: Implement 'source' and 'origin' attributes of ExtendableMessageEvent

third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.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 18 matching lines @@
  */
 
 #include "modules/serviceworkers/ServiceWorker.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MessagePort.h"
 #include "core/events/Event.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/EventTargetModules.h"
+#include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerState.h"
 
 namespace blink {
 
 const AtomicString& ServiceWorker::interfaceName() const
 {
     return EventTargetNames::ServiceWorker;
 }
 
 void ServiceWorker::postMessage(ExecutionContext* context, PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionState& exceptionState)
 {
+    if (!m_provider) {
+        exceptionState.throwDOMException(InvalidStateError, "Failed to post a message: No associated provider is available.");
+        return;
+    }

[falken, 2016/03/02 09:02:48]

Instead of keeping track of m_provider, would it be simpler to just compute it
here from contextExecution()?

[nhiroki, 2016/03/02 09:57:12]

Good point. Changed!

+
     // Disentangle the port in preparation for sending it to the remote context.
     OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
     if (exceptionState.hadException())
         return;
     if (m_handle->serviceWorker()->state() == WebServiceWorkerStateRedundant) {
         exceptionState.throwDOMException(InvalidStateError, "ServiceWorker is in redundant state.");
         return;
     }
 
     if (message->containsTransferableArrayBuffer())
         context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "ServiceWorker cannot send an ArrayBuffer as a transferable object yet. See http://crbug.com/511119"));
 
     WebString messageString = message->toWireString();
     OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePortChannelArray(channels.release());
-    m_handle->serviceWorker()->postMessage(messageString, webChannels.leakPtr());
+    m_handle->serviceWorker()->postMessage(m_provider, messageString, webChannels.leakPtr());
 }
 
 void ServiceWorker::internalsTerminate()
 {
     m_handle->serviceWorker()->terminate();
 }
 
 void ServiceWorker::dispatchStateChangeEvent()
 {
     this->dispatchEvent(Event::create(EventTypeNames::statechange));
@@ skipping 32 matching lines @@
     return getOrCreate(executionContext, handle);
 }
 
 bool ServiceWorker::hasPendingActivity() const
 {
     if (!executionContext())
         return false;
     return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant;
 }
 
+void ServiceWorker::contextDestroyed()
+{
+    m_provider = nullptr;
+}
+
 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
 {
     if (!handle)
         return nullptr;
 
     ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceWorker()->proxy());
     if (existingWorker) {
         ASSERT(existingWorker->executionContext() == executionContext);
         return existingWorker;
     }
 
     return new ServiceWorker(executionContext, handle);
 }
 
 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
     : AbstractWorker(executionContext)
     , m_handle(handle)
+    , m_provider(nullptr)
 {
     ASSERT(m_handle);
+
+    if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext))
+        m_provider = client->provider();
     m_handle->serviceWorker()->setProxy(this);
 }
 
 ServiceWorker::~ServiceWorker()
 {
 }
 
 } // namespace blink