Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/V8Binding.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
Index: third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
index 890547aea5c2f1f1feb51a9e41743195596d2b56..991198527fa2043b767e1b17f33927bc50988f74 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
@@ -711,10 +711,10 @@ ExecutionContext* toExecutionContext(v8::Local<v8::Context> context)
v8::Local<v8::Object> global = context->Global();
v8::Local<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(global, context->GetIsolate());
if (!windowWrapper.IsEmpty())
- return V8Window::toImpl(windowWrapper)->executionContext();
+ return V8Window::toImpl(windowWrapper)->getExecutionContext();
v8::Local<v8::Object> workerWrapper = V8WorkerGlobalScope::findInstanceInPrototypeChain(global, context->GetIsolate());
if (!workerWrapper.IsEmpty())
- return V8WorkerGlobalScope::toImpl(workerWrapper)->executionContext();
+ return V8WorkerGlobalScope::toImpl(workerWrapper)->getExecutionContext();
ASSERT(s_toExecutionContextForModules);
return (*s_toExecutionContextForModules)(context);
}
@@ -787,8 +787,8 @@ v8::Local<v8::Context> toV8Context(ExecutionContext* context, DOMWrapperWorld& w
return toV8Context(frame, world);
} else if (context->isWorkerGlobalScope()) {
if (WorkerOrWorkletScriptController* script = toWorkerOrWorkletGlobalScope(context)->scriptController()) {
- if (script->scriptState()->contextIsValid())
- return script->scriptState()->context();
+ if (script->getScriptState()->contextIsValid())
+ return script->getScriptState()->context();
}
}
return v8::Local<v8::Context>();

Powered by Google App Engine
This is Rietveld 408576698