third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.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/navigatorconnect/AcceptConnectionObserver.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/mediastream/UserMediaRequest.cpp ('k') | third_party/WebKit/Source/modules/navigatorconnect/ServicePortCollection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.cpp

diff --git a/third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.cpp b/third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.cpp

index 0a39eb0af32a52854e02a25e62059526e519380a..f0b4d0100297572e5c7da42305a7ed08746cd634 100644

--- a/third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.cpp

+++ b/third_party/WebKit/Source/modules/navigatorconnect/AcceptConnectionObserver.cpp

@@ -76,7 +76,7 @@ void AcceptConnectionObserver::contextDestroyed()

void AcceptConnectionObserver::didDispatchEvent()

{

- ASSERT(executionContext());

+ ASSERT(getExecutionContext());

if (m_state != Initial)

return;

responseWasRejected();

@@ -99,7 +99,7 @@ ScriptPromise AcceptConnectionObserver::respondWith(ScriptState* scriptState, Sc

void AcceptConnectionObserver::responseWasRejected()

{

- ASSERT(executionContext());

+ ASSERT(getExecutionContext());

if (m_resolver)

m_resolver->reject(DOMException::create(AbortError));

m_callbacks->onError();

@@ -108,9 +108,9 @@ void AcceptConnectionObserver::responseWasRejected()

void AcceptConnectionObserver::responseWasResolved(const ScriptValue& value)

{

- ASSERT(executionContext());

+ ASSERT(getExecutionContext());

- ScriptState* scriptState = m_resolver->scriptState();

+ ScriptState* scriptState = m_resolver->getScriptState();

ExceptionState exceptionState(ExceptionState::UnknownContext, nullptr, nullptr, scriptState->context()->Global(), scriptState->isolate());

ServicePortConnectResponse response = ScriptValue::to<ServicePortConnectResponse>(scriptState->isolate(), value, exceptionState);

if (exceptionState.hadException()) {

@@ -145,7 +145,7 @@ void AcceptConnectionObserver::responseWasResolved(const ScriptValue& value)

}

AcceptConnectionObserver::AcceptConnectionObserver(ServicePortCollection* collection, PassOwnPtr<WebServicePortConnectEventCallbacks> callbacks, WebServicePortID portID, const KURL& targetURL)

- : ContextLifecycleObserver(collection->executionContext())

+ : ContextLifecycleObserver(collection->getExecutionContext())

, m_callbacks(callbacks)

, m_collection(collection)

, m_portID(portID)