| Index: Source/bindings/tests/results/V8TestObject.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp
|
| index 29e9402e7e0823ada371c7d85a6b3d8119efea31..f516becef5ed3d2a207507e658a1f33e7f502a7a 100644
|
| --- a/Source/bindings/tests/results/V8TestObject.cpp
|
| +++ b/Source/bindings/tests/results/V8TestObject.cpp
|
| @@ -1881,7 +1881,7 @@ static void cachedArrayAttributeAttributeGetter(const v8::PropertyCallbackInfo<v
|
| }
|
| }
|
| Vector<String> cppValue(impl->cachedArrayAttribute());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Array(cppValue, info.Holder(), info.GetIsolate()));
|
| + V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Array(cppValue, scriptState->context()->Global(), scriptState->isolate()));
|
| v8SetReturnValue(info, v8Array(cppValue, info.Holder(), info.GetIsolate()));
|
| }
|
|
|
| @@ -1921,7 +1921,7 @@ static void cachedStringOrNoneAttributeAttributeGetter(const v8::PropertyCallbac
|
| }
|
| }
|
| String cppValue(impl->cachedStringOrNoneAttribute());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, cppValue.isNull() ? v8::Handle<v8::Value>(v8::Null(info.GetIsolate())) : v8String(info.GetIsolate(), cppValue));
|
| + V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, cppValue.isNull() ? v8::Handle<v8::Value>(v8::Null(scriptState->isolate())) : v8String(scriptState->isolate(), cppValue));
|
| v8SetReturnValueStringOrNull(info, cppValue, info.GetIsolate());
|
| }
|
|
|
| @@ -4293,7 +4293,7 @@ static void cachedTreatReturnedNullStringAsUndefinedStringAttributeAttributeGett
|
| }
|
| }
|
| String cppValue(impl->cachedTreatReturnedNullStringAsUndefinedStringAttribute());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, cppValue.isNull() ? v8Undefined() : v8String(info.GetIsolate(), cppValue));
|
| + V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8String(scriptState->isolate(), cppValue));
|
| v8SetReturnValueStringOrUndefined(info, cppValue, info.GetIsolate());
|
| }
|
|
|
| @@ -4662,7 +4662,7 @@ static void activityLoggingSetterOnlyLogPreviousValueAttributeAttributeSetterCal
|
| if (scriptState->world().isIsolatedWorld() && contextData && contextData->activityLogger()) {
|
| TestObject* impl = V8TestObject::toNative(info.Holder());
|
| String cppValue(impl->activityLoggingSetterOnlyLogPreviousValueAttribute());
|
| - v8::Handle<v8::Value> originalValue = cppValue.isNull() ? v8::Handle<v8::Value>(v8::Null(info.GetIsolate())) : v8String(info.GetIsolate(), cppValue);
|
| + v8::Handle<v8::Value> originalValue = cppValue.isNull() ? v8::Handle<v8::Value>(v8::Null(scriptState->isolate())) : v8String(scriptState->isolate(), cppValue);
|
| contextData->activityLogger()->logSetter("TestObject.activityLoggingSetterOnlyLogPreviousValueAttribute", v8Value, originalValue);
|
| }
|
| TestObjectV8Internal::activityLoggingSetterOnlyLogPreviousValueAttributeAttributeSetter(v8Value, info);
|
| @@ -4704,7 +4704,7 @@ static void activityLoggingLogPreviousValueInterfaceAttributeAttributeSetterCall
|
| if (scriptState->world().isIsolatedWorld() && contextData && contextData->activityLogger()) {
|
| TestObject* impl = V8TestObject::toNative(info.Holder());
|
| RefPtr<TestInterfaceEmpty> cppValue(impl->activityLoggingLogPreviousValueInterfaceAttribute());
|
| - v8::Handle<v8::Value> originalValue = toV8(cppValue, info.Holder(), info.GetIsolate());
|
| + v8::Handle<v8::Value> originalValue = toV8(cppValue, scriptState->context()->Global(), scriptState->isolate());
|
| contextData->activityLogger()->logSetter("TestObject.activityLoggingLogPreviousValueInterfaceAttribute", v8Value, originalValue);
|
| }
|
| TestObjectV8Internal::activityLoggingLogPreviousValueInterfaceAttributeAttributeSetter(v8Value, info);
|
| @@ -9696,7 +9696,7 @@ static bool voidMethodImplementedInPrivateScriptMethodImplementedInPrivateScript
|
| v8::Handle<v8::Value> *argv = 0;
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "voidMethodImplementedInPrivateScript", holder, 0, argv);
|
| + PrivateScriptRunner::run(scriptState, "TestObject", "voidMethodImplementedInPrivateScript", holder, 0, argv);
|
| if (block.HasCaught())
|
| return false;
|
| return true;
|
| @@ -9732,7 +9732,7 @@ static bool shortMethodImplementedInPrivateScriptMethodImplementedInPrivateScrip
|
| v8::Handle<v8::Value> *argv = 0;
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "shortMethodImplementedInPrivateScript", holder, 0, argv);
|
| + v8::Handle<v8::Value> v8Value = PrivateScriptRunner::run(scriptState, "TestObject", "shortMethodImplementedInPrivateScript", holder, 0, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "shortMethodImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
|
| @@ -9777,7 +9777,7 @@ static bool shortMethodWithShortArgumentImplementedInPrivateScriptMethodImplemen
|
| v8::Handle<v8::Value> argv[] = { valueHandle };
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "shortMethodWithShortArgumentImplementedInPrivateScript", holder, 1, argv);
|
| + v8::Handle<v8::Value> v8Value = PrivateScriptRunner::run(scriptState, "TestObject", "shortMethodWithShortArgumentImplementedInPrivateScript", holder, 1, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "shortMethodWithShortArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
|
| @@ -9833,7 +9833,7 @@ static bool stringMethodWithStringArgumentImplementedInPrivateScriptMethodImplem
|
| v8::Handle<v8::Value> argv[] = { valueHandle };
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "stringMethodWithStringArgumentImplementedInPrivateScript", holder, 1, argv);
|
| + v8::Handle<v8::Value> v8Value = PrivateScriptRunner::run(scriptState, "TestObject", "stringMethodWithStringArgumentImplementedInPrivateScript", holder, 1, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "stringMethodWithStringArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
|
| @@ -9886,7 +9886,7 @@ static bool nodeMethodWithNodeArgumentImplementedInPrivateScriptMethodImplemente
|
| v8::Handle<v8::Value> argv[] = { valueHandle };
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "nodeMethodWithNodeArgumentImplementedInPrivateScript", holder, 1, argv);
|
| + v8::Handle<v8::Value> v8Value = PrivateScriptRunner::run(scriptState, "TestObject", "nodeMethodWithNodeArgumentImplementedInPrivateScript", holder, 1, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "nodeMethodWithNodeArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
|
| @@ -9945,7 +9945,7 @@ static bool nodeMethodWithVariousArgumentsImplementedInPrivateScriptMethodImplem
|
| v8::Handle<v8::Value> argv[] = { documentHandle, nodeHandle, value1Handle, value2Handle, stringHandle };
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "nodeMethodWithVariousArgumentsImplementedInPrivateScript", holder, 5, argv);
|
| + v8::Handle<v8::Value> v8Value = PrivateScriptRunner::run(scriptState, "TestObject", "nodeMethodWithVariousArgumentsImplementedInPrivateScript", holder, 5, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "nodeMethodWithVariousArgumentsImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
|
|
|