Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerClients.cpp

Issue 396963002: ServiceWorker: Bypass resolving a promise when ExecutionContext is gone (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 12 matching lines...) Expand all
23 typedef blink::WebServiceWorkerClientsInfo WebType; 23 typedef blink::WebServiceWorkerClientsInfo WebType;
24 static WillBeHeapVector<RefPtrWillBeMember<Client> > from(ScriptPromiseR esolver*, WebType* webClientsRaw) 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 WillBeHeapVector<RefPtrWillBeMember<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 static void dispose(WebType* webClientsRaw)
34 {
35 delete webClientsRaw;
36 }
33 37
34 private: 38 private:
35 WTF_MAKE_NONCOPYABLE(ClientArray); 39 WTF_MAKE_NONCOPYABLE(ClientArray);
36 ClientArray() WTF_DELETED_FUNCTION; 40 ClientArray() WTF_DELETED_FUNCTION;
37 }; 41 };
38 42
39 } // namespace 43 } // namespace
40 44
41 PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create() 45 PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create()
42 { 46 {
43 return adoptRefWillBeNoop(new ServiceWorkerClients()); 47 return adoptRefWillBeNoop(new ServiceWorkerClients());
44 } 48 }
45 49
46 ServiceWorkerClients::ServiceWorkerClients() 50 ServiceWorkerClients::ServiceWorkerClients()
47 { 51 {
48 ScriptWrappable::init(this); 52 ScriptWrappable::init(this);
49 } 53 }
50 54
51 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients); 55 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients);
52 56
53 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) 57 ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState)
54 { 58 {
55 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); 59 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState);
56 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver)); 60 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->getCl ients(new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(resolver));
57 return resolver->promise(); 61 return resolver->promise();
58 } 62 }
59 63
60 } // namespace blink 64 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorker.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698