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/OwnPtr.h" | |
20 #include "wtf/PassOwnPtr.h" | 19 #include "wtf/PassOwnPtr.h" |
21 #include "wtf/RefPtr.h" | 20 #include "wtf/RefPtr.h" |
22 #include "wtf/Vector.h" | 21 #include "wtf/Vector.h" |
23 | 22 |
24 namespace blink { | 23 namespace blink { |
25 | 24 |
26 namespace { | 25 namespace { |
27 | 26 |
28 class ClientArray { | 27 class ClientArray { |
29 public: | 28 public: |
30 using WebType = OwnPtr<WebServiceWorkerClientsInfo>; | 29 using WebType = const WebServiceWorkerClientsInfo&; |
31 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*,
PassOwnPtr<WebServiceWorkerClientsInfo> webClients) | 30 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*,
const WebServiceWorkerClientsInfo& webClients) |
32 { | 31 { |
33 HeapVector<Member<ServiceWorkerClient>> clients; | 32 HeapVector<Member<ServiceWorkerClient>> clients; |
34 for (size_t i = 0; i < webClients->clients.size(); ++i) { | 33 for (size_t i = 0; i < webClients.clients.size(); ++i) { |
35 const WebServiceWorkerClientInfo& client = webClients->clients[i]; | 34 const WebServiceWorkerClientInfo& client = webClients.clients[i]; |
36 if (client.clientType == WebServiceWorkerClientTypeWindow) | 35 if (client.clientType == WebServiceWorkerClientTypeWindow) |
37 clients.append(ServiceWorkerWindowClient::create(client)); | 36 clients.append(ServiceWorkerWindowClient::create(client)); |
38 else | 37 else |
39 clients.append(ServiceWorkerClient::create(client)); | 38 clients.append(ServiceWorkerClient::create(client)); |
40 } | 39 } |
41 return clients; | 40 return clients; |
42 } | 41 } |
43 | 42 |
44 private: | 43 private: |
45 WTF_MAKE_NONCOPYABLE(ClientArray); | 44 WTF_MAKE_NONCOPYABLE(ClientArray); |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t
o open a window.")); | 124 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t
o open a window.")); |
126 return promise; | 125 return promise; |
127 } | 126 } |
128 context->consumeWindowInteraction(); | 127 context->consumeWindowInteraction(); |
129 | 128 |
130 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal
lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); | 129 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Cal
lbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolver)); |
131 return promise; | 130 return promise; |
132 } | 131 } |
133 | 132 |
134 } // namespace blink | 133 } // namespace blink |
OLD | NEW |