| 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))
|
|
|