Chromium Code Reviews| 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/ServiceWorkerClient.h" | 10 #include "modules/serviceworkers/ServiceWorkerClient.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 blink { | 17 namespace blink { |
| 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 WillBeHeapVector<RefPtrWillBeMember<ServiceWorkerClient> > take(S criptPromiseResolver*, WebType* webClientsRaw) | 24 static HeapVector<Member<ServiceWorkerClient> > take(ScriptPromiseResolv er*, WebType* webClientsRaw) |
| 25 { | 25 { |
| 26 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); | 26 OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); |
| 27 WillBeHeapVector<RefPtrWillBeMember<ServiceWorkerClient> > clients; | 27 HeapVector<Member<ServiceWorkerClient> > 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(ServiceWorkerClient::create(webClients->clientIDs [i])); | 29 clients.append(ServiceWorkerClient::create(webClients->clientIDs [i])); |
| 30 } | 30 } |
| 31 return clients; | 31 return clients; |
| 32 } | 32 } |
| 33 static void dispose(WebType* webClientsRaw) | 33 static void dispose(WebType* webClientsRaw) |
| 34 { | 34 { |
| 35 delete webClientsRaw; | 35 delete webClientsRaw; |
| 36 } | 36 } |
| 37 | 37 |
| 38 private: | 38 private: |
| 39 WTF_MAKE_NONCOPYABLE(ClientArray); | 39 WTF_MAKE_NONCOPYABLE(ClientArray); |
| 40 ClientArray() WTF_DELETED_FUNCTION; | 40 ClientArray() WTF_DELETED_FUNCTION; |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create() | 45 ServiceWorkerClients* ServiceWorkerClients::create() |
|
dominicc (has gone to gerrit)
2014/08/26 14:01:34
Ditto.
| |
| 46 { | 46 { |
| 47 return adoptRefWillBeNoop(new ServiceWorkerClients()); | 47 return new ServiceWorkerClients(); |
| 48 } | 48 } |
| 49 | 49 |
| 50 ServiceWorkerClients::ServiceWorkerClients() | 50 ServiceWorkerClients::ServiceWorkerClients() |
| 51 { | 51 { |
| 52 ScriptWrappable::init(this); | 52 ScriptWrappable::init(this); |
| 53 } | 53 } |
| 54 | 54 |
| 55 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients); | |
| 56 | |
| 57 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) | 55 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) |
| 58 { | 56 { |
| 59 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); | 57 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); |
| 60 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver)); | 58 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver)); |
| 61 return resolver->promise(); | 59 return resolver->promise(); |
| 62 } | 60 } |
| 63 | 61 |
| 64 } // namespace blink | 62 } // namespace blink |
| OLD | NEW |