third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.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/bindings/core/v8/WorkerOrWorkletScriptController.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/bindings/core/v8/WorkerOrWorkletScriptController.h ('k') | third_party/WebKit/Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp

index fbdbb4dbbe68963974ee9ffd3128cf9cb8af8d41..e0e0c22926d3ec4e2c66adee1f2214f7b689a18d 100644

--- a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp

@@ -152,7 +152,7 @@ bool WorkerOrWorkletScriptController::initializeContextIfNeeded()

WorkerThreadDebugger::setContextDebugData(context);

// Create a new JS object and use it as the prototype for the shadow global object.

- const WrapperTypeInfo* wrapperTypeInfo = m_globalScope->scriptWrappable()->wrapperTypeInfo();

+ const WrapperTypeInfo* wrapperTypeInfo = m_globalScope->getScriptWrappable()->wrapperTypeInfo();

v8::Local<v8::Function> globalScopeConstructor = m_scriptState->perContextData()->constructorForType(wrapperTypeInfo);

if (globalScopeConstructor.IsEmpty())

@@ -164,7 +164,7 @@ bool WorkerOrWorkletScriptController::initializeContextIfNeeded()

return false;

}

- jsGlobalScope = V8DOMWrapper::associateObjectWithWrapper(m_isolate, m_globalScope->scriptWrappable(), wrapperTypeInfo, jsGlobalScope);

+ jsGlobalScope = V8DOMWrapper::associateObjectWithWrapper(m_isolate, m_globalScope->getScriptWrappable(), wrapperTypeInfo, jsGlobalScope);

// Insert the object instance as the prototype of the shadow object.

v8::Local<v8::Object> globalObject = v8::Local<v8::Object>::Cast(m_scriptState->context()->Global()->GetPrototype());