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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.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/V8ErrorHandler.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp b/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
index c03012f27a45867d23cd3c8cd9d1d502d5254352..7bea7df90e365615a435a3ab67a28d31d879a3ec 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
@@ -56,7 +56,7 @@ v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptState* scriptSta
if (errorEvent->world() && errorEvent->world() != &world())
return v8::Null(isolate());
- v8::Local<v8::Object> listener = getListenerObject(scriptState->executionContext());
+ v8::Local<v8::Object> listener = getListenerObject(scriptState->getExecutionContext());
if (listener.IsEmpty() || !listener->IsFunction())
return v8::Null(isolate());
@@ -74,10 +74,10 @@ v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptState* scriptSta
v8::TryCatch tryCatch(isolate());
tryCatch.SetVerbose(true);
v8::MaybeLocal<v8::Value> result;
- if (scriptState->executionContext()->isWorkerGlobalScope()) {
- result = V8ScriptRunner::callFunction(callFunction, scriptState->executionContext(), thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate());
+ if (scriptState->getExecutionContext()->isWorkerGlobalScope()) {
+ result = V8ScriptRunner::callFunction(callFunction, scriptState->getExecutionContext(), thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate());
} else {
- result = ScriptController::callFunction(scriptState->executionContext(), callFunction, thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate());
+ result = ScriptController::callFunction(scriptState->getExecutionContext(), callFunction, thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate());
}
v8::Local<v8::Value> returnValue;
if (!result.ToLocal(&returnValue))

Powered by Google App Engine
This is Rietveld 408576698