third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp ('k') | third_party/WebKit/Source/modules/quota/DeprecatedStorageQuota.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

index fa77180bd4964d8a6486b28b9fd4d9f215e38df8..8dea00150ae6fa1062a5fc184a7f94a80635a065 100644

--- a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

+++ b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

@@ -10,7 +10,6 @@

#include "modules/serviceworkers/ServiceWorkerRegistration.h"

#include "public/platform/modules/push_messaging/WebPushSubscription.h"

#include "wtf/Assertions.h"

-#include "wtf/PtrUtil.h"

namespace blink {

@@ -31,7 +30,7 @@ void PushSubscriptionCallbacks::onSuccess(std::unique_ptr<WebPushSubscription> w

if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())

return;

- m_resolver->resolve(PushSubscription::take(m_resolver.get(), wrapUnique(webPushSubscription.release()), m_serviceWorkerRegistration));

+ m_resolver->resolve(PushSubscription::take(m_resolver.get(), adoptPtr(webPushSubscription.release()), m_serviceWorkerRegistration));

}

void PushSubscriptionCallbacks::onError(const WebPushError& error)