| Index: Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| diff --git a/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp b/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| index 7d607504d501b713e4ff58eb7a2a22c5a269bc50..03c19fa7c85edbde2d6391083de247da4d0021d8 100644
|
| --- a/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| +++ b/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| @@ -46,7 +46,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()), m_scriptState->context()->Global(), 0, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate());
|
| }
|
|
|
| bool V8TestCallbackInterface::booleanMethod()
|
| @@ -62,7 +62,7 @@ bool V8TestCallbackInterface::booleanMethod()
|
|
|
| v8::TryCatch exceptionCatcher;
|
| exceptionCatcher.SetVerbose(true);
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 0, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 0, argv, m_scriptState->isolate());
|
| return !exceptionCatcher.HasCaught();
|
| }
|
|
|
| @@ -83,7 +83,7 @@ void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg)
|
| }
|
| v8::Local<v8::Value> argv[] = { boolArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::voidMethodSequenceArg(const Vector<RefPtr<TestInterfaceEmpty>>& sequenceArg)
|
| @@ -103,7 +103,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()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::voidMethodFloatArg(float floatArg)
|
| @@ -123,7 +123,7 @@ void V8TestCallbackInterface::voidMethodFloatArg(float floatArg)
|
| }
|
| v8::Local<v8::Value> argv[] = { floatArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty* testInterfaceEmptyArg)
|
| @@ -143,7 +143,7 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty
|
| }
|
| v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfaceEmpty* testInterfaceEmptyArg, const String& stringArg)
|
| @@ -169,7 +169,7 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfac
|
| }
|
| v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle, stringArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 2, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 2, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptValue thisValue, const String& stringArg)
|
| @@ -215,7 +215,7 @@ void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedSequenceArg(const
|
| }
|
| v8::Local<v8::Value> argv[] = { sequenceArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedArrayArg(const WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>& arrayArg)
|
| @@ -235,7 +235,7 @@ void V8TestCallbackInterface::voidMethodWillBeGarbageCollectedArrayArg(const Wil
|
| }
|
| v8::Local<v8::Value> argv[] = { arrayArgHandle };
|
|
|
| - ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), 1, argv, m_scriptState->isolate());
|
| + ScriptController::callFunction(m_scriptState->executionContext(), m_callback.newLocal(m_scriptState->isolate()), v8::Undefined(m_scriptState->isolate()), 1, argv, m_scriptState->isolate());
|
| }
|
|
|
| } // namespace blink
|
|
|