| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| index 3fbc71d3b5486a406c43ff7992a3d8b25215e404..8ebc65a396abc34c910abb89b318eddfd5e277ca 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| @@ -66,10 +66,6 @@ static void uLongLongAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8:
|
| v8SetReturnValue(info, static_cast<double>(impl->uLongLongAttribute()));
|
| }
|
|
|
| -CORE_EXPORT void uLongLongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::uLongLongAttributeAttributeGetter(info);
|
| -}
|
| -
|
| static void uLongLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(holder);
|
| @@ -84,12 +80,6 @@ static void uLongLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, cons
|
| impl->setULongLongAttribute(cppValue);
|
| }
|
|
|
| -CORE_EXPORT void uLongLongAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - v8::Local<v8::Value> v8Value = info[0];
|
| -
|
| - TestTypedefsV8Internal::uLongLongAttributeAttributeSetter(v8Value, info);
|
| -}
|
| -
|
| static void domStringOrDoubleOrNullAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8::Local<v8::Object> holder = info.Holder();
|
|
|
| @@ -101,10 +91,6 @@ static void domStringOrDoubleOrNullAttributeAttributeGetter(const v8::FunctionCa
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void domStringOrDoubleOrNullAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeGetter(info);
|
| -}
|
| -
|
| static void domStringOrDoubleOrNullAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(holder);
|
| @@ -120,12 +106,6 @@ static void domStringOrDoubleOrNullAttributeAttributeSetter(v8::Local<v8::Value>
|
| impl->setDomStringOrDoubleOrNullAttribute(cppValue);
|
| }
|
|
|
| -CORE_EXPORT void domStringOrDoubleOrNullAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - v8::Local<v8::Value> v8Value = info[0];
|
| -
|
| - TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeSetter(v8Value, info);
|
| -}
|
| -
|
| static void voidMethodArrayOfLongsArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "voidMethodArrayOfLongsArg");
|
|
|
| @@ -149,10 +129,6 @@ static void voidMethodArrayOfLongsArgMethod(const v8::FunctionCallbackInfo<v8::V
|
| impl->voidMethodArrayOfLongsArg(arrayOfLongsArg);
|
| }
|
|
|
| -CORE_EXPORT void voidMethodArrayOfLongsArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::voidMethodArrayOfLongsArgMethod(info);
|
| -}
|
| -
|
| static void voidMethodFloatArgStringArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "voidMethodFloatArgStringArg");
|
|
|
| @@ -176,10 +152,6 @@ static void voidMethodFloatArgStringArgMethod(const v8::FunctionCallbackInfo<v8:
|
| impl->voidMethodFloatArgStringArg(floatArg, stringArg);
|
| }
|
|
|
| -CORE_EXPORT void voidMethodFloatArgStringArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::voidMethodFloatArgStringArgMethod(info);
|
| -}
|
| -
|
| static void voidMethodTestCallbackInterfaceTypeArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
|
|
| @@ -199,10 +171,6 @@ static void voidMethodTestCallbackInterfaceTypeArgMethod(const v8::FunctionCallb
|
| impl->voidMethodTestCallbackInterfaceTypeArg(testCallbackInterfaceTypeArg);
|
| }
|
|
|
| -CORE_EXPORT void voidMethodTestCallbackInterfaceTypeArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::voidMethodTestCallbackInterfaceTypeArgMethod(info);
|
| -}
|
| -
|
| static void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "uLongLongMethodTestInterfaceEmptyTypeSequenceArg");
|
|
|
| @@ -221,10 +189,6 @@ static void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(const v8::Fun
|
| v8SetReturnValue(info, static_cast<double>(impl->uLongLongMethodTestInterfaceEmptyTypeSequenceArg(testInterfaceEmptyTypeSequenceArg)));
|
| }
|
|
|
| -CORE_EXPORT void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(info);
|
| -}
|
| -
|
| static void testInterfaceOrTestInterfaceEmptyMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
|
|
| @@ -233,10 +197,6 @@ static void testInterfaceOrTestInterfaceEmptyMethodMethod(const v8::FunctionCall
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void testInterfaceOrTestInterfaceEmptyMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::testInterfaceOrTestInterfaceEmptyMethodMethod(info);
|
| -}
|
| -
|
| static void domStringOrDoubleMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
|
|
| @@ -245,10 +205,6 @@ static void domStringOrDoubleMethodMethod(const v8::FunctionCallbackInfo<v8::Val
|
| v8SetReturnValue(info, result);
|
| }
|
|
|
| -CORE_EXPORT void domStringOrDoubleMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::domStringOrDoubleMethodMethod(info);
|
| -}
|
| -
|
| static void arrayOfStringsMethodArrayOfStringsArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "arrayOfStringsMethodArrayOfStringsArg");
|
|
|
| @@ -267,10 +223,6 @@ static void arrayOfStringsMethodArrayOfStringsArgMethod(const v8::FunctionCallba
|
| v8SetReturnValue(info, ToV8(impl->arrayOfStringsMethodArrayOfStringsArg(arrayOfStringsArg), info.Holder(), info.GetIsolate()));
|
| }
|
|
|
| -CORE_EXPORT void arrayOfStringsMethodArrayOfStringsArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::arrayOfStringsMethodArrayOfStringsArgMethod(info);
|
| -}
|
| -
|
| static void stringArrayMethodStringArrayArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "stringArrayMethodStringArrayArg");
|
|
|
| @@ -289,10 +241,6 @@ static void stringArrayMethodStringArrayArgMethod(const v8::FunctionCallbackInfo
|
| v8SetReturnValue(info, ToV8(impl->stringArrayMethodStringArrayArg(stringArrayArg), info.Holder(), info.GetIsolate()));
|
| }
|
|
|
| -CORE_EXPORT void stringArrayMethodStringArrayArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| - TestTypedefsV8Internal::stringArrayMethodStringArrayArgMethod(info);
|
| -}
|
| -
|
| static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| if (UNLIKELY(info.Length() < 1)) {
|
| V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToConstruct("TestTypedefs", ExceptionMessages::notEnoughArguments(1, info.Length())));
|
| @@ -312,6 +260,58 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
|
|
| } // namespace TestTypedefsV8Internal
|
|
|
| +void V8TestTypedefs::uLongLongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::uLongLongAttributeAttributeGetter(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::uLongLongAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| +
|
| + TestTypedefsV8Internal::uLongLongAttributeAttributeSetter(v8Value, info);
|
| +}
|
| +
|
| +void V8TestTypedefs::domStringOrDoubleOrNullAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeGetter(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::domStringOrDoubleOrNullAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + v8::Local<v8::Value> v8Value = info[0];
|
| +
|
| + TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeSetter(v8Value, info);
|
| +}
|
| +
|
| +void V8TestTypedefs::voidMethodArrayOfLongsArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::voidMethodArrayOfLongsArgMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::voidMethodFloatArgStringArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::voidMethodFloatArgStringArgMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::voidMethodTestCallbackInterfaceTypeArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::voidMethodTestCallbackInterfaceTypeArgMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::testInterfaceOrTestInterfaceEmptyMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::testInterfaceOrTestInterfaceEmptyMethodMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::domStringOrDoubleMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::domStringOrDoubleMethodMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::arrayOfStringsMethodArrayOfStringsArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::arrayOfStringsMethodArrayOfStringsArgMethod(info);
|
| +}
|
| +
|
| +void V8TestTypedefs::stringArrayMethodStringArrayArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + TestTypedefsV8Internal::stringArrayMethodStringArrayArgMethod(info);
|
| +}
|
| +
|
| // Suppress warning: global constructors, because AttributeConfiguration is trivial
|
| // and does not depend on another global objects.
|
| #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
|
| @@ -319,26 +319,26 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| #pragma clang diagnostic ignored "-Wglobal-constructors"
|
| #endif
|
| const V8DOMConfiguration::AttributeConfiguration V8TestTypedefsLazyDataAttributes[] = {
|
| - {"tAttribute", v8ConstructorAttributeGetter, 0, 0, 0, nullptr, const_cast<WrapperTypeInfo*>(&V8TestInterface::wrapperTypeInfo), static_cast<v8::PropertyAttribute>(v8::DontEnum), V8DOMConfiguration::OnInstance, V8DOMConfiguration::CheckHolder},
|
| + {"tAttribute", v8ConstructorAttributeGetter, nullptr, nullptr, nullptr, nullptr, const_cast<WrapperTypeInfo*>(&V8TestInterface::wrapperTypeInfo), static_cast<v8::PropertyAttribute>(v8::DontEnum), V8DOMConfiguration::OnInstance, V8DOMConfiguration::CheckHolder},
|
| };
|
| #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
|
| #pragma clang diagnostic pop
|
| #endif
|
|
|
| const V8DOMConfiguration::AccessorConfiguration V8TestTypedefsAccessors[] = {
|
| - {"uLongLongAttribute", TestTypedefsV8Internal::uLongLongAttributeAttributeGetterCallback, TestTypedefsV8Internal::uLongLongAttributeAttributeSetterCallback, 0, 0, nullptr, 0, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"domStringOrDoubleOrNullAttribute", TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeGetterCallback, TestTypedefsV8Internal::domStringOrDoubleOrNullAttributeAttributeSetterCallback, 0, 0, nullptr, 0, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"uLongLongAttribute", V8TestTypedefs::uLongLongAttributeAttributeGetterCallback, V8TestTypedefs::uLongLongAttributeAttributeSetterCallback, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"domStringOrDoubleOrNullAttribute", V8TestTypedefs::domStringOrDoubleOrNullAttributeAttributeGetterCallback, V8TestTypedefs::domStringOrDoubleOrNullAttributeAttributeSetterCallback, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| };
|
|
|
| const V8DOMConfiguration::MethodConfiguration V8TestTypedefsMethods[] = {
|
| - {"voidMethodArrayOfLongsArg", TestTypedefsV8Internal::voidMethodArrayOfLongsArgMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"voidMethodFloatArgStringArg", TestTypedefsV8Internal::voidMethodFloatArgStringArgMethodCallback, 0, 2, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"voidMethodTestCallbackInterfaceTypeArg", TestTypedefsV8Internal::voidMethodTestCallbackInterfaceTypeArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"uLongLongMethodTestInterfaceEmptyTypeSequenceArg", TestTypedefsV8Internal::uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"testInterfaceOrTestInterfaceEmptyMethod", TestTypedefsV8Internal::testInterfaceOrTestInterfaceEmptyMethodMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"domStringOrDoubleMethod", TestTypedefsV8Internal::domStringOrDoubleMethodMethodCallback, 0, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"arrayOfStringsMethodArrayOfStringsArg", TestTypedefsV8Internal::arrayOfStringsMethodArrayOfStringsArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| - {"stringArrayMethodStringArrayArg", TestTypedefsV8Internal::stringArrayMethodStringArrayArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"voidMethodArrayOfLongsArg", V8TestTypedefs::voidMethodArrayOfLongsArgMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"voidMethodFloatArgStringArg", V8TestTypedefs::voidMethodFloatArgStringArgMethodCallback, nullptr, 2, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"voidMethodTestCallbackInterfaceTypeArg", V8TestTypedefs::voidMethodTestCallbackInterfaceTypeArgMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"uLongLongMethodTestInterfaceEmptyTypeSequenceArg", V8TestTypedefs::uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"testInterfaceOrTestInterfaceEmptyMethod", V8TestTypedefs::testInterfaceOrTestInterfaceEmptyMethodMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"domStringOrDoubleMethod", V8TestTypedefs::domStringOrDoubleMethodMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"arrayOfStringsMethodArrayOfStringsArg", V8TestTypedefs::arrayOfStringsMethodArrayOfStringsArgMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| + {"stringArrayMethodStringArrayArg", V8TestTypedefs::stringArrayMethodStringArrayArgMethodCallback, nullptr, 1, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder},
|
| };
|
|
|
| void V8TestTypedefs::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
|
|
|