third_party/WebKit/Source/core/workers/InProcessWorkerBase.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/core/workers/InProcessWorkerBase.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/core/workers/AbstractWorker.cpp ('k') | third_party/WebKit/Source/core/workers/SharedWorker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp

diff --git a/third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp b/third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp

index 2185d87bc680a646f447073786debe1b1184e5a5..0c46c5ec4e46d64f0b5f4ba31d005107219782b8 100644

--- a/third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp

+++ b/third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp

@@ -90,7 +90,7 @@ ContentSecurityPolicy* InProcessWorkerBase::contentSecurityPolicy()

void InProcessWorkerBase::onResponse()

{

- InspectorInstrumentation::didReceiveScriptResponse(executionContext(), m_scriptLoader->identifier());

+ InspectorInstrumentation::didReceiveScriptResponse(getExecutionContext(), m_scriptLoader->identifier());

}

void InProcessWorkerBase::onFinished()

@@ -99,8 +99,8 @@ void InProcessWorkerBase::onFinished()

dispatchEvent(Event::createCancelable(EventTypeNames::error));

} else {

ASSERT(m_contextProxy);

- m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), executionContext()->userAgent(), m_scriptLoader->script());

- InspectorInstrumentation::scriptImported(executionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());

+ m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), getExecutionContext()->userAgent(), m_scriptLoader->script());

+ InspectorInstrumentation::scriptImported(getExecutionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());

}

m_contentSecurityPolicy = m_scriptLoader->releaseContentSecurityPolicy();

m_scriptLoader = nullptr;