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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 "modules/serviceworkers/ServiceWorkerClients.h" 5 #include "modules/serviceworkers/ServiceWorkerClients.h"
6 6
7 #include "bindings/core/v8/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/ExceptionCode.h" 10 #include "core/dom/ExceptionCode.h"
11 #include "core/workers/WorkerGlobalScope.h" 11 #include "core/workers/WorkerGlobalScope.h"
12 #include "core/workers/WorkerLocation.h" 12 #include "core/workers/WorkerLocation.h"
13 #include "modules/serviceworkers/ServiceWorkerError.h" 13 #include "modules/serviceworkers/ServiceWorkerError.h"
14 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" 14 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
15 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" 15 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
16 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" 16 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
17 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptio ns.h" 17 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptio ns.h"
18 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h" 18 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
19 #include "wtf/OwnPtr.h" 19 #include "wtf/PtrUtil.h"
20 #include "wtf/PassOwnPtr.h"
21 #include "wtf/RefPtr.h" 20 #include "wtf/RefPtr.h"
22 #include "wtf/Vector.h" 21 #include "wtf/Vector.h"
22 #include <memory>
23 23
24 namespace blink { 24 namespace blink {
25 25
26 namespace { 26 namespace {
27 27
28 class ClientArray { 28 class ClientArray {
29 public: 29 public:
30 using WebType = const WebServiceWorkerClientsInfo&; 30 using WebType = const WebServiceWorkerClientsInfo&;
31 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, const WebServiceWorkerClientsInfo& webClients) 31 static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, const WebServiceWorkerClientsInfo& webClients)
32 { 32 {
(...skipping 28 matching lines...) Expand all
61 } 61 }
62 62
63 class GetCallback : public WebServiceWorkerClientCallbacks { 63 class GetCallback : public WebServiceWorkerClientCallbacks {
64 public: 64 public:
65 explicit GetCallback(ScriptPromiseResolver* resolver) 65 explicit GetCallback(ScriptPromiseResolver* resolver)
66 : m_resolver(resolver) { } 66 : m_resolver(resolver) { }
67 ~GetCallback() override { } 67 ~GetCallback() override { }
68 68
69 void onSuccess(std::unique_ptr<WebServiceWorkerClientInfo> webClient) overri de 69 void onSuccess(std::unique_ptr<WebServiceWorkerClientInfo> webClient) overri de
70 { 70 {
71 OwnPtr<WebServiceWorkerClientInfo> client = adoptPtr(webClient.release() ); 71 std::unique_ptr<WebServiceWorkerClientInfo> client = wrapUnique(webClien t.release());
72 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContex t()->activeDOMObjectsAreStopped()) 72 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContex t()->activeDOMObjectsAreStopped())
73 return; 73 return;
74 if (!client) { 74 if (!client) {
75 // Resolve the promise with undefined. 75 // Resolve the promise with undefined.
76 m_resolver->resolve(); 76 m_resolver->resolve();
77 return; 77 return;
78 } 78 }
79 m_resolver->resolve(ServiceWorkerClient::take(m_resolver, std::move(clie nt))); 79 m_resolver->resolve(ServiceWorkerClient::take(m_resolver, std::move(clie nt)));
80 } 80 }
81 81
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window.")); 170 resolver->reject(DOMException::create(InvalidAccessError, "Not allowed t o open a window."));
171 return promise; 171 return promise;
172 } 172 }
173 context->consumeWindowInteraction(); 173 context->consumeWindowInteraction();
174 174
175 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Nav igateClientCallback(resolver)); 175 ServiceWorkerGlobalScopeClient::from(context)->openWindow(parsedUrl, new Nav igateClientCallback(resolver));
176 return promise; 176 return promise;
177 } 177 }
178 178
179 } // namespace blink 179 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698