| Index: Source/bindings/tests/results/core/V8TestNode.cpp
|
| diff --git a/Source/bindings/tests/results/core/V8TestNode.cpp b/Source/bindings/tests/results/core/V8TestNode.cpp
|
| index 7100e74085b3e544142aa3d06b2ea30e63cec986..1f146a4b3b56a6c2cdc6cf23ea8e243f749b821e 100644
|
| --- a/Source/bindings/tests/results/core/V8TestNode.cpp
|
| +++ b/Source/bindings/tests/results/core/V8TestNode.cpp
|
| @@ -30,21 +30,21 @@ const WrapperTypeInfo& TestNode::s_wrapperTypeInfo = V8TestNode::wrapperTypeInfo
|
|
|
| namespace TestNodeV8Internal {
|
|
|
| -static void hrefAttributeGetter(const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| v8SetReturnValueString(info, impl->href(), info.GetIsolate());
|
| }
|
|
|
| -static void hrefAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter");
|
| TestNodeV8Internal::hrefAttributeGetter(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| @@ -54,28 +54,29 @@ static void hrefAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Property
|
| impl->setHref(cppValue);
|
| }
|
|
|
| -static void hrefAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMSetter");
|
| TestNodeV8Internal::hrefAttributeSetter(v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefThrowsAttributeGetter(const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefThrowsAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| v8SetReturnValueString(info, impl->hrefThrows(), info.GetIsolate());
|
| }
|
|
|
| -static void hrefThrowsAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefThrowsAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter");
|
| TestNodeV8Internal::hrefThrowsAttributeGetter(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefThrowsAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefThrowsAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "hrefThrows", "TestNode", holder, info.GetIsolate());
|
| @@ -87,28 +88,29 @@ static void hrefThrowsAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Pr
|
| exceptionState.throwIfNeeded();
|
| }
|
|
|
| -static void hrefThrowsAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefThrowsAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMSetter");
|
| TestNodeV8Internal::hrefThrowsAttributeSetter(v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefCallWithAttributeGetter(const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefCallWithAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| v8SetReturnValueString(info, impl->hrefCallWith(), info.GetIsolate());
|
| }
|
|
|
| -static void hrefCallWithAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefCallWithAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter");
|
| TestNodeV8Internal::hrefCallWithAttributeGetter(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefCallWithAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefCallWithAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| @@ -119,28 +121,29 @@ static void hrefCallWithAttributeSetter(v8::Local<v8::Value> v8Value, const v8::
|
| impl->setHrefCallWith(executionContext, callingDOMWindow(info.GetIsolate()), enteredDOMWindow(info.GetIsolate()), cppValue);
|
| }
|
|
|
| -static void hrefCallWithAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefCallWithAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMSetter");
|
| TestNodeV8Internal::hrefCallWithAttributeSetter(v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefByteStringAttributeGetter(const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefByteStringAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestNode* impl = V8TestNode::toImpl(holder);
|
| v8SetReturnValueString(info, impl->hrefByteString(), info.GetIsolate());
|
| }
|
|
|
| -static void hrefByteStringAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| +static void hrefByteStringAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter");
|
| TestNodeV8Internal::hrefByteStringAttributeGetter(info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| }
|
|
|
| -static void hrefByteStringAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefByteStringAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "hrefByteString", "TestNode", holder, info.GetIsolate());
|
| @@ -151,8 +154,9 @@ static void hrefByteStringAttributeSetter(v8::Local<v8::Value> v8Value, const v8
|
| impl->setHrefByteString(cppValue);
|
| }
|
|
|
| -static void hrefByteStringAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| +static void hrefByteStringAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMSetter");
|
| TestNodeV8Internal::hrefByteStringAttributeSetter(v8Value, info);
|
| TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution");
|
| @@ -168,11 +172,11 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
|
|
| } // namespace TestNodeV8Internal
|
|
|
| -static const V8DOMConfiguration::AttributeConfiguration V8TestNodeAttributes[] = {
|
| - {"href", TestNodeV8Internal::hrefAttributeGetterCallback, TestNodeV8Internal::hrefAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance},
|
| - {"hrefThrows", TestNodeV8Internal::hrefThrowsAttributeGetterCallback, TestNodeV8Internal::hrefThrowsAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance},
|
| - {"hrefCallWith", TestNodeV8Internal::hrefCallWithAttributeGetterCallback, TestNodeV8Internal::hrefCallWithAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance},
|
| - {"hrefByteString", TestNodeV8Internal::hrefByteStringAttributeGetterCallback, TestNodeV8Internal::hrefByteStringAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnInstance},
|
| +static const V8DOMConfiguration::AccessorConfiguration V8TestNodeAccessors[] = {
|
| + {"href", TestNodeV8Internal::hrefAttributeGetterCallback, TestNodeV8Internal::hrefAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts},
|
| + {"hrefThrows", TestNodeV8Internal::hrefThrowsAttributeGetterCallback, TestNodeV8Internal::hrefThrowsAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts},
|
| + {"hrefCallWith", TestNodeV8Internal::hrefCallWithAttributeGetterCallback, TestNodeV8Internal::hrefCallWithAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts},
|
| + {"hrefByteString", TestNodeV8Internal::hrefByteStringAttributeGetterCallback, TestNodeV8Internal::hrefByteStringAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts},
|
| };
|
|
|
| void V8TestNode::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -197,8 +201,8 @@ static void installV8TestNodeTemplate(v8::Local<v8::FunctionTemplate> functionTe
|
|
|
| v8::Local<v8::Signature> defaultSignature;
|
| defaultSignature = V8DOMConfiguration::installDOMClassTemplate(isolate, functionTemplate, "TestNode", V8Node::domTemplate(isolate), V8TestNode::internalFieldCount,
|
| - V8TestNodeAttributes, WTF_ARRAY_LENGTH(V8TestNodeAttributes),
|
| 0, 0,
|
| + V8TestNodeAccessors, WTF_ARRAY_LENGTH(V8TestNodeAccessors),
|
| 0, 0);
|
| functionTemplate->SetCallHandler(V8TestNode::constructorCallback);
|
| functionTemplate->SetLength(0);
|
|
|