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

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp

diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp

index 9ca7aad177b56cc2040dc1f5489c95af284777c6..cb2509f5d38ea658149e1a2d172856144f9a871a 100644

--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp

+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp

@@ -49,7 +49,7 @@ public:

void onSuccess() override

{

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

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

return;

m_device->gatt()->setConnected(true);

if (!m_device->page()->isPageVisible()) {

@@ -66,7 +66,7 @@ public:

void onError(const WebBluetoothError& e) override

{

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

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

return;

m_resolver->reject(BluetoothError::take(m_resolver, e));

}

@@ -81,7 +81,7 @@ ScriptPromise BluetoothRemoteGATTServer::connect(ScriptState* scriptState)

// This is a short term solution instead of implementing a tab indicator

// for bluetooth connections.

// https://crbug.com/579746

- if (!toDocument(scriptState->executionContext())->page()->isPageVisible()) {

+ if (!toDocument(scriptState->getExecutionContext())->page()->isPageVisible()) {

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, kPageHiddenError));

}