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 "modules/serviceworkers/Client.h" | 10 #include "modules/serviceworkers/Client.h" |
11 #include "modules/serviceworkers/ServiceWorkerError.h" | 11 #include "modules/serviceworkers/ServiceWorkerError.h" |
12 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 12 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
13 #include "public/platform/WebServiceWorkerClientsInfo.h" | 13 #include "public/platform/WebServiceWorkerClientsInfo.h" |
14 #include "wtf/RefPtr.h" | 14 #include "wtf/RefPtr.h" |
15 #include "wtf/Vector.h" | 15 #include "wtf/Vector.h" |
16 | 16 |
17 namespace WebCore { | 17 namespace WebCore { |
18 | 18 |
19 namespace { | 19 namespace { |
20 | 20 |
21 class ClientArray { | 21 class ClientArray { |
22 public: | 22 public: |
23 typedef blink::WebServiceWorkerClientsInfo WebType; | 23 typedef blink::WebServiceWorkerClientsInfo WebType; |
24 static Vector<RefPtr<Client> > from(ScriptPromiseResolver*, WebType* web
ClientsRaw) | 24 static WillBeHeapVector<RefPtrWillBeMember<Client> > from(ScriptPromiseR
esolver*, WebType* webClientsRaw) |
25 { | 25 { |
26 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); | 26 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); |
27 Vector<RefPtr<Client> > clients; | 27 WillBeHeapVector<RefPtrWillBeMember<Client> > clients; |
28 for (size_t i = 0; i < webClients->clientIDs.size(); ++i) { | 28 for (size_t i = 0; i < webClients->clientIDs.size(); ++i) { |
29 clients.append(Client::create(webClients->clientIDs[i])); | 29 clients.append(Client::create(webClients->clientIDs[i])); |
30 } | 30 } |
31 return clients; | 31 return clients; |
32 } | 32 } |
33 | 33 |
34 private: | 34 private: |
35 WTF_MAKE_NONCOPYABLE(ClientArray); | 35 WTF_MAKE_NONCOPYABLE(ClientArray); |
36 ClientArray() WTF_DELETED_FUNCTION; | 36 ClientArray() WTF_DELETED_FUNCTION; |
37 }; | 37 }; |
38 | 38 |
39 } // namespace | 39 } // namespace |
40 | 40 |
41 PassRefPtr<ServiceWorkerClients> ServiceWorkerClients::create() | 41 PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create() |
42 { | 42 { |
43 return adoptRef(new ServiceWorkerClients()); | 43 return adoptRefWillBeNoop(new ServiceWorkerClients()); |
44 } | 44 } |
45 | 45 |
46 ServiceWorkerClients::ServiceWorkerClients() | 46 ServiceWorkerClients::ServiceWorkerClients() |
47 { | 47 { |
48 ScriptWrappable::init(this); | 48 ScriptWrappable::init(this); |
49 } | 49 } |
50 | 50 |
51 ServiceWorkerClients::~ServiceWorkerClients() | 51 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients); |
52 { | |
53 } | |
54 | 52 |
55 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) | 53 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) |
56 { | 54 { |
57 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip
tState); | 55 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip
tState); |
58 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl
ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver)); | 56 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl
ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver)); |
59 return resolver->promise(); | 57 return resolver->promise(); |
60 } | 58 } |
61 | 59 |
62 } // namespace WebCore | 60 } // namespace WebCore |
OLD | NEW |