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

Side by Side Diff: third_party/WebKit/Source/modules/push_messaging/PushSubscription.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/push_messaging/PushSubscription.h" 5 #include "modules/push_messaging/PushSubscription.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 "bindings/core/v8/V8ObjectBuilder.h" 9 #include "bindings/core/v8/V8ObjectBuilder.h"
10 #include "modules/push_messaging/PushError.h" 10 #include "modules/push_messaging/PushError.h"
11 #include "modules/serviceworkers/ServiceWorkerRegistration.h" 11 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
12 #include "public/platform/Platform.h" 12 #include "public/platform/Platform.h"
13 #include "public/platform/modules/push_messaging/WebPushProvider.h" 13 #include "public/platform/modules/push_messaging/WebPushProvider.h"
14 #include "public/platform/modules/push_messaging/WebPushSubscription.h" 14 #include "public/platform/modules/push_messaging/WebPushSubscription.h"
15 #include "wtf/Assertions.h" 15 #include "wtf/Assertions.h"
16 #include "wtf/OwnPtr.h"
17 #include "wtf/text/Base64.h" 16 #include "wtf/text/Base64.h"
17 #include <memory>
18 18
19 namespace blink { 19 namespace blink {
20 20
21 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, PassOwnPtr<WebP ushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorkerRegis tration) 21 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, std::unique_ptr <WebPushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorker Registration)
22 { 22 {
23 if (!pushSubscription) 23 if (!pushSubscription)
24 return nullptr; 24 return nullptr;
25 return new PushSubscription(*pushSubscription, serviceWorkerRegistration); 25 return new PushSubscription(*pushSubscription, serviceWorkerRegistration);
26 } 26 }
27 27
28 void PushSubscription::dispose(WebPushSubscription* pushSubscription) 28 void PushSubscription::dispose(WebPushSubscription* pushSubscription)
29 { 29 {
30 if (pushSubscription) 30 if (pushSubscription)
31 delete pushSubscription; 31 delete pushSubscription;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 } 86 }
87 87
88 DEFINE_TRACE(PushSubscription) 88 DEFINE_TRACE(PushSubscription)
89 { 89 {
90 visitor->trace(m_p256dh); 90 visitor->trace(m_p256dh);
91 visitor->trace(m_auth); 91 visitor->trace(m_auth);
92 visitor->trace(m_serviceWorkerRegistration); 92 visitor->trace(m_serviceWorkerRegistration);
93 } 93 }
94 94
95 } // namespace blink 95 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698