| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| index f7784f878d6045b559ee2c5133ba9d2401501af1..19663253d6668ed80fb2f75204474d0fd34c2d59 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| @@ -190,7 +190,7 @@ static void readonlyTestInterfaceEmptyAttributeAttributeGetter(const v8::Functio
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| if (!v8Value.IsEmpty()) {
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "readonlyTestInterfaceEmptyAttribute"), v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "readonlyTestInterfaceEmptyAttribute"), v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
| }
|
| @@ -2279,7 +2279,7 @@ static void cachedAttributeAnyAttributeAttributeGetter(const v8::FunctionCallbac
|
| v8::Local<v8::String> propertyName = v8AtomicString(info.GetIsolate(), "cachedAttributeAnyAttribute");
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| if (!impl->isValueDirty()) {
|
| - v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(info.GetIsolate(), holder, propertyName);
|
| + v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName);
|
| if (!v8Value.IsEmpty()) {
|
| v8SetReturnValue(info, v8Value);
|
| return;
|
| @@ -2287,7 +2287,7 @@ static void cachedAttributeAnyAttributeAttributeGetter(const v8::FunctionCallbac
|
| }
|
| ScriptValue cppValue(impl->cachedAttributeAnyAttribute());
|
| v8::Local<v8::Value> v8Value(cppValue.v8Value());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName, v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| @@ -2304,7 +2304,7 @@ static void cachedAttributeAnyAttributeAttributeSetter(v8::Local<v8::Value> v8Va
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| ScriptValue cppValue = ScriptValue(ScriptState::current(info.GetIsolate()), v8Value);
|
| impl->setCachedAttributeAnyAttribute(cppValue);
|
| - V8HiddenValue::deleteHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "cachedAttributeAnyAttribute")); // Invalidate the cached value.
|
| + V8HiddenValue::deleteHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "cachedAttributeAnyAttribute")); // Invalidate the cached value.
|
| }
|
|
|
| static void cachedAttributeAnyAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -2321,7 +2321,7 @@ static void cachedArrayAttributeAttributeGetter(const v8::FunctionCallbackInfo<v
|
| v8::Local<v8::String> propertyName = v8AtomicString(info.GetIsolate(), "cachedArrayAttribute");
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| if (!impl->isArrayDirty()) {
|
| - v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(info.GetIsolate(), holder, propertyName);
|
| + v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName);
|
| if (!v8Value.IsEmpty()) {
|
| v8SetReturnValue(info, v8Value);
|
| return;
|
| @@ -2329,7 +2329,7 @@ static void cachedArrayAttributeAttributeGetter(const v8::FunctionCallbackInfo<v
|
| }
|
| Vector<String> cppValue(impl->cachedArrayAttribute());
|
| v8::Local<v8::Value> v8Value(toV8(cppValue, holder, info.GetIsolate()));
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName, v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| @@ -2349,7 +2349,7 @@ static void cachedArrayAttributeAttributeSetter(v8::Local<v8::Value> v8Value, co
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| impl->setCachedArrayAttribute(cppValue);
|
| - V8HiddenValue::deleteHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "cachedArrayAttribute")); // Invalidate the cached value.
|
| + V8HiddenValue::deleteHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "cachedArrayAttribute")); // Invalidate the cached value.
|
| }
|
|
|
| static void cachedArrayAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -2366,7 +2366,7 @@ static void cachedStringOrNoneAttributeAttributeGetter(const v8::FunctionCallbac
|
| v8::Local<v8::String> propertyName = v8AtomicString(info.GetIsolate(), "cachedStringOrNoneAttribute");
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| if (!impl->isStringDirty()) {
|
| - v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(info.GetIsolate(), holder, propertyName);
|
| + v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName);
|
| if (!v8Value.IsEmpty()) {
|
| v8SetReturnValue(info, v8Value);
|
| return;
|
| @@ -2374,7 +2374,7 @@ static void cachedStringOrNoneAttributeAttributeGetter(const v8::FunctionCallbac
|
| }
|
| String cppValue(impl->cachedStringOrNoneAttribute());
|
| v8::Local<v8::Value> v8Value(cppValue.isNull() ? v8::Local<v8::Value>(v8::Null(info.GetIsolate())) : v8String(info.GetIsolate(), cppValue));
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName, v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| @@ -2393,7 +2393,7 @@ static void cachedStringOrNoneAttributeAttributeSetter(v8::Local<v8::Value> v8Va
|
| if (!cppValue.prepare())
|
| return;
|
| impl->setCachedStringOrNoneAttribute(cppValue);
|
| - V8HiddenValue::deleteHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "cachedStringOrNoneAttribute")); // Invalidate the cached value.
|
| + V8HiddenValue::deleteHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "cachedStringOrNoneAttribute")); // Invalidate the cached value.
|
| }
|
|
|
| static void cachedStringOrNoneAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -2948,7 +2948,7 @@ static void perWorldBindingsReadonlyTestInterfaceEmptyAttributeAttributeGetter(c
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| if (!v8Value.IsEmpty()) {
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
| }
|
| @@ -2969,7 +2969,7 @@ static void perWorldBindingsReadonlyTestInterfaceEmptyAttributeAttributeGetterFo
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| if (!v8Value.IsEmpty()) {
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "perWorldBindingsReadonlyTestInterfaceEmptyAttribute"), v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
| }
|
| @@ -3542,7 +3542,7 @@ static void locationGarbageCollectedAttributeGetter(const v8::FunctionCallbackIn
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| if (!v8Value.IsEmpty()) {
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "locationGarbageCollected"), v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "locationGarbageCollected"), v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
| }
|
| @@ -3582,7 +3582,7 @@ static void locationWillBeGarbageCollectedAttributeGetter(const v8::FunctionCall
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| if (!v8Value.IsEmpty()) {
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "locationWillBeGarbageCollected"), v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "locationWillBeGarbageCollected"), v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
| }
|
| @@ -3764,7 +3764,7 @@ static void cachedAttributeRaisesExceptionGetterAnyAttributeAttributeGetter(cons
|
| v8::Local<v8::String> propertyName = v8AtomicString(info.GetIsolate(), "cachedAttributeRaisesExceptionGetterAnyAttribute");
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| if (!impl->isValueDirty()) {
|
| - v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(info.GetIsolate(), holder, propertyName);
|
| + v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName);
|
| if (!v8Value.IsEmpty()) {
|
| v8SetReturnValue(info, v8Value);
|
| return;
|
| @@ -3775,7 +3775,7 @@ static void cachedAttributeRaisesExceptionGetterAnyAttributeAttributeGetter(cons
|
| if (UNLIKELY(exceptionState.throwIfNeeded()))
|
| return;
|
| v8::Local<v8::Value> v8Value(cppValue.v8Value());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName, v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| @@ -3794,7 +3794,7 @@ static void cachedAttributeRaisesExceptionGetterAnyAttributeAttributeSetter(v8::
|
| ScriptValue cppValue = ScriptValue(ScriptState::current(info.GetIsolate()), v8Value);
|
| impl->setCachedAttributeRaisesExceptionGetterAnyAttribute(cppValue, exceptionState);
|
| exceptionState.throwIfNeeded();
|
| - V8HiddenValue::deleteHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "cachedAttributeRaisesExceptionGetterAnyAttribute")); // Invalidate the cached value.
|
| + V8HiddenValue::deleteHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "cachedAttributeRaisesExceptionGetterAnyAttribute")); // Invalidate the cached value.
|
| }
|
|
|
| static void cachedAttributeRaisesExceptionGetterAnyAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -4827,7 +4827,7 @@ static void cachedTreatReturnedNullStringAsUndefinedStringAttributeAttributeGett
|
| v8::Local<v8::String> propertyName = v8AtomicString(info.GetIsolate(), "cachedTreatReturnedNullStringAsUndefinedStringAttribute");
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| if (!impl->isStringDirty()) {
|
| - v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(info.GetIsolate(), holder, propertyName);
|
| + v8::Local<v8::Value> v8Value = V8HiddenValue::getHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName);
|
| if (!v8Value.IsEmpty()) {
|
| v8SetReturnValue(info, v8Value);
|
| return;
|
| @@ -4835,7 +4835,7 @@ static void cachedTreatReturnedNullStringAsUndefinedStringAttributeAttributeGett
|
| }
|
| String cppValue(impl->cachedTreatReturnedNullStringAsUndefinedStringAttribute());
|
| v8::Local<v8::Value> v8Value(cppValue.isNull() ? v8Undefined() : v8String(info.GetIsolate(), cppValue));
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), holder, propertyName, v8Value);
|
| + V8HiddenValue::setHiddenValue(ScriptState::current(info.GetIsolate()), holder, propertyName, v8Value);
|
| v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| @@ -4854,7 +4854,7 @@ static void cachedTreatReturnedNullStringAsUndefinedStringAttributeAttributeSett
|
| if (!cppValue.prepare())
|
| return;
|
| impl->setCachedTreatReturnedNullStringAsUndefinedStringAttribute(cppValue);
|
| - V8HiddenValue::deleteHiddenValue(info.GetIsolate(), holder, v8AtomicString(info.GetIsolate(), "cachedTreatReturnedNullStringAsUndefinedStringAttribute")); // Invalidate the cached value.
|
| + V8HiddenValue::deleteHiddenValue(ScriptState::current(info.GetIsolate()), holder, v8AtomicString(info.GetIsolate(), "cachedTreatReturnedNullStringAsUndefinedStringAttribute")); // Invalidate the cached value.
|
| }
|
|
|
| static void cachedTreatReturnedNullStringAsUndefinedStringAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|