| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/serviceworkers/ServiceWorkerClients.h" | 6 #include "modules/serviceworkers/ServiceWorkerClients.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" | 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| 9 #include "bindings/core/v8/ScriptPromiseResolver.h" | 9 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 10 #include "core/dom/DOMException.h" | 10 #include "core/dom/DOMException.h" |
| 11 #include "core/dom/ExceptionCode.h" | 11 #include "core/dom/ExceptionCode.h" |
| 12 #include "core/workers/WorkerGlobalScope.h" | 12 #include "core/workers/WorkerGlobalScope.h" |
| 13 #include "core/workers/WorkerLocation.h" | 13 #include "core/workers/WorkerLocation.h" |
| 14 #include "modules/serviceworkers/ServiceWorkerError.h" | 14 #include "modules/serviceworkers/ServiceWorkerError.h" |
| 15 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 15 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
| 16 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" | 16 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" |
| 17 #include "public/platform/WebServiceWorkerClientQueryOptions.h" | 17 #include "public/platform/WebServiceWorkerClientQueryOptions.h" |
| 18 #include "public/platform/WebServiceWorkerClientsInfo.h" | 18 #include "public/platform/WebServiceWorkerClientsInfo.h" |
| 19 #include "wtf/RefPtr.h" | 19 #include "wtf/RefPtr.h" |
| 20 #include "wtf/Vector.h" | 20 #include "wtf/Vector.h" |
| 21 | 21 |
| 22 namespace blink { | 22 namespace blink { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 class ClientArray { | 26 class ClientArray { |
| 27 public: | 27 public: |
| 28 typedef blink::WebServiceWorkerClientsInfo WebType; | 28 typedef WebServiceWorkerClientsInfo WebType; |
| 29 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*,
WebType* webClientsRaw) | 29 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*,
WebType* webClientsRaw) |
| 30 { | 30 { |
| 31 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); | 31 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); |
| 32 HeapVector<Member<ServiceWorkerClient>> clients; | 32 HeapVector<Member<ServiceWorkerClient>> clients; |
| 33 for (size_t i = 0; i < webClients->clients.size(); ++i) { | 33 for (size_t i = 0; i < webClients->clients.size(); ++i) { |
| 34 const WebServiceWorkerClientInfo& client = webClients->clients[i]; | 34 const WebServiceWorkerClientInfo& client = webClients->clients[i]; |
| 35 if (client.clientType == WebServiceWorkerClientTypeWindow) | 35 if (client.clientType == WebServiceWorkerClientTypeWindow) |
| 36 clients.append(ServiceWorkerWindowClient::create(client)); | 36 clients.append(ServiceWorkerWindowClient::create(client)); |
| 37 else | 37 else |
| 38 clients.append(ServiceWorkerClient::create(client)); | 38 clients.append(ServiceWorkerClient::create(client)); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t
o open a window.")); | 128 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t
o open a window.")); |
| 129 return promise; | 129 return promise; |
| 130 } | 130 } |
| 131 context->consumeWindowInteraction(); | 131 context->consumeWindowInteraction(); |
| 132 | 132 |
| 133 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal
lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); | 133 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal
lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); |
| 134 return promise; | 134 return promise; |
| 135 } | 135 } |
| 136 | 136 |
| 137 } // namespace blink | 137 } // namespace blink |
| OLD | NEW |