Service Worker: Add Clients.get(id)

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/serviceworkers/ServiceWorkerClient.h"
+#include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "public/platform/WebString.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
+ServiceWorkerClient* ServiceWorkerClient::take(ScriptPromiseResolver*, PassOwnPtr<WebServiceWorkerClientInfo> webClient)
+{
+    ServiceWorkerClient* client;
+    if (!webClient)
+        client = nullptr;
+    else if (webClient->clientType == WebServiceWorkerClientTypeWindow)
+        client = ServiceWorkerWindowClient::create(*webClient);
+    else
+        client = ServiceWorkerClient::create(*webClient);

[nhiroki, 2016/02/03 09:40:00]

Can you verify the passed |webClient| type using switch statement?



if (!webClient)
    return nullptr;

switch (webClient->clientType) {
case WebServiceWorkerClientTypeWindow:
    return ServiceWorkerWindowClient::create(*webClient);
case WebServiceWorkerClientTypeWorker:
case WebServiceWorkerClientTypeSharedWorker:
    return ServiceWorkerClient::create(*webClient);
case WebServiceWorkerClientTypeAll:
case WebServiceWorkerClientTypeLast:
    ASSERT_NOT_REACHED();
    return nullptr;
}

[jungkees, 2016/02/03 14:15:07]

Addressed. Thanks!

+    return client;
+}
+
 ServiceWorkerClient* ServiceWorkerClient::create(const WebServiceWorkerClientInfo& info)
 {
     return new ServiceWorkerClient(info);
 }
 
 ServiceWorkerClient::ServiceWorkerClient(const WebServiceWorkerClientInfo& info)
     : m_uuid(info.uuid)
     , m_url(info.url.string())
     , m_frameType(info.frameType)
 {
@@ skipping 29 matching lines @@
 
     if (message->containsTransferableArrayBuffer())
         context->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "ServiceWorkerClient 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());
     ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_uuid, messageString, webChannels.release());
 }
 
 } // namespace blink