third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h - 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/ServiceWorkerRegistration.h

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

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

index 3325a8d17c031ecb8db3093ddcecfae2c9951e29..b28a3c21a69daaba273ea701abb07e049103d585 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

@@ -38,7 +38,7 @@ class ServiceWorkerRegistration final

public:

// EventTarget overrides.

const AtomicString& interfaceName() const override;

- ExecutionContext* executionContext() const override { return ActiveDOMObject::executionContext(); }

+ ExecutionContext* getExecutionContext() const override { return ActiveDOMObject::getExecutionContext(); }

// WebServiceWorkerRegistrationProxy overrides.

void dispatchUpdateFoundEvent() override;

@@ -94,7 +94,7 @@ public:

{

HeapVector<Member<ServiceWorkerRegistration>> registrations;

for (auto& registration : *webServiceWorkerRegistrations)

- registrations.append(ServiceWorkerRegistration::getOrCreate(resolver->executionContext(), registration.release()));

+ registrations.append(ServiceWorkerRegistration::getOrCreate(resolver->getExecutionContext(), registration.release()));

return registrations;

}

};