ServiceWorker: Support non-window clients in Clients.matchAll (2/2 blink)

Source/modules/serviceworkers/ServiceWorkerClients.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 "config.h"
 #include "modules/serviceworkers/ServiceWorkerClients.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 12 matching lines @@
 namespace {
 
 class ClientArray {
 public:
     typedef blink::WebServiceWorkerClientsInfo WebType;
     static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, WebType* webClientsRaw)
     {
         OwnPtr<WebType> webClients = adoptPtr(webClientsRaw);
         HeapVector<Member<ServiceWorkerClient>> clients;
         for (size_t i = 0; i < webClients->clients.size(); ++i) {
-            // FIXME: For now we only support getting "window" type clients.
-            ASSERT(webClients->clients[i].clientType == WebServiceWorkerClientTypeWindow);
-            clients.append(ServiceWorkerWindowClient::create(webClients->clients[i]));
+            WebServiceWorkerClientInfo& client = webClients->clients[i];

[falken, 2015/03/31 04:34:32]

can this be const?

[nhiroki, 2015/04/01 04:51:34]

Done.

+            if (client.clientType == WebServiceWorkerClientTypeWindow)
+                clients.append(ServiceWorkerWindowClient::create(client));
+            else
+                clients.append(ServiceWorkerClient::create(client));
         }
         return clients;
     }
     static void dispose(WebType* webClientsRaw)
     {
         delete webClientsRaw;
     }
 
 private:
     WTF_MAKE_NONCOPYABLE(ClientArray);
@@ skipping 28 matching lines @@
 ScriptPromise ServiceWorkerClients::matchAll(ScriptState* scriptState, const ClientQueryOptions& options)
 {
     ExecutionContext* executionContext = scriptState->executionContext();
     // FIXME: May be null due to worker termination: http://crbug.com/413518.
     if (!executionContext)
         return ScriptPromise();
 
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    if (options.type() != "window") {
-        // FIXME: Remove this when query options are supported in the embedder.
-        resolver->reject(DOMException::create(NotSupportedError, "type parameter of getAll is not supported."));
-        return promise;
-    }
-
     WebServiceWorkerClientQueryOptions webOptions;
     webOptions.clientType = getClientType(options.type());
     webOptions.includeUncontrolled = options.includeUncontrolled();
     ServiceWorkerGlobalScopeClient::from(executionContext)->getClients(webOptions, new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver));
     return promise;
 }
 
 ScriptPromise ServiceWorkerClients::claim(ScriptState* scriptState)
 {
     ExecutionContext* executionContext = scriptState->executionContext();
@@ skipping 31 matching lines @@
         resolver->reject(DOMException::create(InvalidAccessError, "Not allowed to open a window."));
         return promise;
     }
     context->consumeWindowInteraction();
 
     ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver));
     return promise;
 }
 
 } // namespace blink