third_party/WebKit/Source/modules/geolocation/Geolocation.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/geolocation/Geolocation.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/gamepad/GamepadEvent.idl ('k') | third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

index 634e878327c79059024b94374b9c1dae5838115e..19d50a7ceb1dc26c0b62679286cdf473ec3b4d67 100644

--- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

+++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

@@ -112,7 +112,7 @@ DEFINE_TRACE(Geolocation)

Document* Geolocation::document() const

{

- return toDocument(executionContext());

+ return toDocument(getExecutionContext());

}

LocalFrame* Geolocation::frame() const

@@ -187,7 +187,7 @@ int Geolocation::watchPosition(PositionCallback* successCallback, PositionErrorC

int watchID;

// Keep asking for the next id until we're given one that we don't already have.

do {

- watchID = executionContext()->circularSequentialID();

+ watchID = getExecutionContext()->circularSequentialID();

} while (!m_watchers.add(watchID, notifier));

return watchID;

}

@@ -196,7 +196,7 @@ void Geolocation::startRequest(GeoNotifier *notifier)

{

recordOriginTypeAccess();

String errorMessage;

- if (!frame()->settings()->allowGeolocationOnInsecureOrigins() && !executionContext()->isSecureContext(errorMessage)) {

+ if (!frame()->settings()->allowGeolocationOnInsecureOrigins() && !getExecutionContext()->isSecureContext(errorMessage)) {

notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, errorMessage));

return;

}