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

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

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

index 9ad3c6ac88a5eae82d28cba638de552633bc5e8b..85047432b18a241eece8970955421cedeb2f4bd0 100644

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

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

@@ -130,7 +130,7 @@ ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa

ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceWorker()->proxy());

if (existingWorker) {

- ASSERT(existingWorker->executionContext() == executionContext);

+ ASSERT(existingWorker->getExecutionContext() == executionContext);

return existingWorker;

}