third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.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/serviceworkers/ServiceWorkerWindowClientCallback.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/serviceworkers/ServiceWorkerWindowClient.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

index f773917d0aa8409b9531a0f250485f07eb52c48a..f6387fc059a50799df4a095281e669b243b57636 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

@@ -13,19 +13,19 @@ namespace blink {

void NavigateClientCallback::onSuccess(WebPassOwnPtr<WebServiceWorkerClientInfo> clientInfo)

{

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

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

return;

m_resolver->resolve(ServiceWorkerWindowClient::take(m_resolver.get(), clientInfo.release()));

}

void NavigateClientCallback::onError(const WebServiceWorkerError& error)

{

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

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

return;

if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) {

- ScriptState::Scope scope(m_resolver->scriptState());

- m_resolver->reject(V8ThrowException::createTypeError(m_resolver->scriptState()->isolate(), error.message));

+ ScriptState::Scope scope(m_resolver->getScriptState());

+ m_resolver->reject(V8ThrowException::createTypeError(m_resolver->getScriptState()->isolate(), error.message));

return;

}