third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/PushPermissionStatusCallbacks.cpp ('k') | third_party/WebKit/Source/modules/quota/DeprecatedStorageQuota.cpp » ('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 c854beeab3a25c0eceae4b42a607bcbfa83611df..b36197e69aa69fe9425c189cf8a37c709d36c5f7 100644

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

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

@@ -26,7 +26,7 @@ PushSubscriptionCallbacks::~PushSubscriptionCallbacks()

void PushSubscriptionCallbacks::onSuccess(WebPassOwnPtr<WebPushSubscription> webPushSubscription)

{

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

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

return;

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

@@ -34,7 +34,7 @@ void PushSubscriptionCallbacks::onSuccess(WebPassOwnPtr<WebPushSubscription> web

void PushSubscriptionCallbacks::onError(const WebPushError& error)

{

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

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

return;

m_resolver->reject(PushError::take(m_resolver.get(), error));

}