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

Unified Diff: Source/modules/push_messaging/PushSubscription.cpp

Issue 1304723002: [PushMessaging] Use appopriate type parameters for WebCallbacks (1/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/push_messaging/PushSubscription.cpp
diff --git a/Source/modules/push_messaging/PushSubscription.cpp b/Source/modules/push_messaging/PushSubscription.cpp
index 087dc6e17b898a60f7de37f27cf626f31970eb3d..bbe326a8722e291a3379b0ff8bf09a0e12e94815 100644
--- a/Source/modules/push_messaging/PushSubscription.cpp
+++ b/Source/modules/push_messaging/PushSubscription.cpp
@@ -17,10 +17,11 @@
namespace blink {
-PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscription* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
+PushSubscription* PushSubscription::take(ScriptPromiseResolver*, PassOwnPtr<WebPushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
{
- OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription);
- return new PushSubscription(*subscription, serviceWorkerRegistration);
+ if (!pushSubscription)
+ return nullptr;
+ return new PushSubscription(*pushSubscription, serviceWorkerRegistration);
}
void PushSubscription::dispose(WebPushSubscription* pushSubscription)
« no previous file with comments | « Source/modules/push_messaging/PushSubscription.h ('k') | Source/modules/push_messaging/PushSubscriptionCallbacks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698