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

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

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

index 21d5c6610d48dcc30743691f5678bdd050ad71e5..a246e1b0d952cf4c6a40192597c7bf5f9e4d99df 100644

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

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

@@ -73,7 +73,7 @@ void processMessageOnWorkerGlobalScope(PassRefPtr<SerializedScriptValue> message

} // namespace

WorkerMessagingProxy::WorkerMessagingProxy(InProcessWorkerBase* workerObject, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)

- : m_executionContext(workerObject->executionContext())

+ : m_executionContext(workerObject->getExecutionContext())

, m_workerObjectProxy(WorkerObjectProxy::create(this))

, m_workerObject(workerObject)

, m_mayBeDestroyed(false)

@@ -108,7 +108,7 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S

return;

}

Document* document = toDocument(m_executionContext.get());

- SecurityOrigin* starterOrigin = document->securityOrigin();

+ SecurityOrigin* starterOrigin = document->getSecurityOrigin();

ContentSecurityPolicy* csp = m_workerObject->contentSecurityPolicy() ? m_workerObject->contentSecurityPolicy() : document->contentSecurityPolicy();

ASSERT(csp);