| Index: Source/bindings/tests/results/V8TestEventTarget.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestEventTarget.cpp b/Source/bindings/tests/results/V8TestEventTarget.cpp
|
| index 867101a50aa6a41b332f59bbc177151797e26d85..ca4e50f8588490ed31e95a78f73afde386def2a9 100644
|
| --- a/Source/bindings/tests/results/V8TestEventTarget.cpp
|
| +++ b/Source/bindings/tests/results/V8TestEventTarget.cpp
|
| @@ -97,11 +97,11 @@ static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCall
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| -static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TestEventTarget* impl = V8TestEventTarget::toNative(info.Holder());
|
| - V8TRYCATCH_VOID(Node*, propertyValue, V8Node::toNativeWithTypeCheck(info.GetIsolate(), jsValue));
|
| - if (!isUndefinedOrNull(jsValue) && !V8Node::hasInstance(jsValue, info.GetIsolate())) {
|
| + V8TRYCATCH_VOID(Node*, propertyValue, V8Node::toNativeWithTypeCheck(info.GetIsolate(), v8Value));
|
| + if (!isUndefinedOrNull(v8Value) && !V8Node::hasInstance(v8Value, info.GetIsolate())) {
|
| exceptionState.throwTypeError("The provided value is not of type 'Node'.");
|
| exceptionState.throwIfNeeded();
|
| return;
|
| @@ -109,13 +109,13 @@ static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> jsValue,
|
| bool result = impl->anonymousIndexedSetter(index, propertyValue);
|
| if (!result)
|
| return;
|
| - v8SetReturnValue(info, jsValue);
|
| + v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| -static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void indexedPropertySetterCallback(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMIndexedProperty");
|
| - TestEventTargetV8Internal::indexedPropertySetter(index, jsValue, info);
|
| + TestEventTargetV8Internal::indexedPropertySetter(index, v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| @@ -159,7 +159,7 @@ static void namedPropertyGetterCallback(v8::Local<v8::String> name, const v8::Pr
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| -static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| if (info.Holder()->HasRealNamedProperty(name))
|
| return;
|
| @@ -168,17 +168,17 @@ static void namedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value>
|
|
|
| TestEventTarget* impl = V8TestEventTarget::toNative(info.Holder());
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyName, name);
|
| - V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyValue, jsValue);
|
| + V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyValue, v8Value);
|
| bool result = impl->anonymousNamedSetter(propertyName, propertyValue);
|
| if (!result)
|
| return;
|
| - v8SetReturnValue(info, jsValue);
|
| + v8SetReturnValue(info, v8Value);
|
| }
|
|
|
| -static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void namedPropertySetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMNamedProperty");
|
| - TestEventTargetV8Internal::namedPropertySetter(name, jsValue, info);
|
| + TestEventTargetV8Internal::namedPropertySetter(name, v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
|
| }
|
|
|
| @@ -281,14 +281,14 @@ v8::Handle<v8::FunctionTemplate> V8TestEventTarget::domTemplate(v8::Isolate* iso
|
| return result;
|
| }
|
|
|
| -bool V8TestEventTarget::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate)
|
| +bool V8TestEventTarget::hasInstance(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| {
|
| - return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, jsValue);
|
| + return V8PerIsolateData::from(isolate)->hasInstance(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| -v8::Handle<v8::Object> V8TestEventTarget::findInstanceInPrototypeChain(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate)
|
| +v8::Handle<v8::Object> V8TestEventTarget::findInstanceInPrototypeChain(v8::Handle<v8::Value> v8Value, v8::Isolate* isolate)
|
| {
|
| - return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, jsValue);
|
| + return V8PerIsolateData::from(isolate)->findInstanceInPrototypeChain(&wrapperTypeInfo, v8Value);
|
| }
|
|
|
| TestEventTarget* V8TestEventTarget::toNativeWithTypeCheck(v8::Isolate* isolate, v8::Handle<v8::Value> value)
|
|
|