Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
index 6f9bdadac3d1c8033ec801742720d8ebcd2741ec..94735c0f761538583d4ae97957dc67f25a14328b 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
@@ -18,7 +18,7 @@ |
namespace blink { |
V8TestCallbackInterface::V8TestCallbackInterface(v8::Local<v8::Function> callback, ScriptState* scriptState) |
- : ActiveDOMCallback(scriptState->executionContext()) |
+ : ActiveDOMCallback(scriptState->getExecutionContext()) |
, m_scriptState(scriptState) |
{ |
m_callback.set(scriptState->isolate(), callback); |
@@ -45,7 +45,7 @@ void V8TestCallbackInterface::voidMethod() |
ScriptState::Scope scope(m_scriptState.get()); |
v8::Local<v8::Value> *argv = 0; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate()); |
} |
bool V8TestCallbackInterface::booleanMethod() |
@@ -61,7 +61,7 @@ bool V8TestCallbackInterface::booleanMethod() |
v8::TryCatch exceptionCatcher(m_scriptState->isolate()); |
exceptionCatcher.SetVerbose(true); |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate()); |
return !exceptionCatcher.HasCaught(); |
} |
@@ -82,7 +82,7 @@ void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg) |
} |
v8::Local<v8::Value> argv[] = { boolArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodSequenceArg(const Vector<RefPtr<TestInterfaceEmpty>>& sequenceArg) |
@@ -102,7 +102,7 @@ void V8TestCallbackInterface::voidMethodSequenceArg(const Vector<RefPtr<TestInte |
} |
v8::Local<v8::Value> argv[] = { sequenceArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodFloatArg(float floatArg) |
@@ -122,7 +122,7 @@ void V8TestCallbackInterface::voidMethodFloatArg(float floatArg) |
} |
v8::Local<v8::Value> argv[] = { floatArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty* testInterfaceEmptyArg) |
@@ -142,7 +142,7 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty |
} |
v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfaceEmpty* testInterfaceEmptyArg, const String& stringArg) |
@@ -168,7 +168,7 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfac |
} |
v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle, stringArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 2, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 2, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptValue thisValue, const String& stringArg) |
@@ -194,7 +194,7 @@ void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptVal |
} |
v8::Local<v8::Value> argv[] = { stringArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), thisHandle, 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), thisHandle, 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedSequenceArg(const WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>& sequenceArg) |
@@ -214,7 +214,7 @@ void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedSequenceArg(const |
} |
v8::Local<v8::Value> argv[] = { sequenceArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedArrayArg(const WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>& arrayArg) |
@@ -234,7 +234,7 @@ void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedArrayArg(const Wil |
} |
v8::Local<v8::Value> argv[] = { arrayArgHandle }; |
- ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
+ ScriptController::callFunction(m_scriptState->getExecutionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate()); |
} |
} // namespace blink |