| 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 b4fbe08629eabb83c5c103f084aab28bfe6270de..33523b2dcbfa8cdbda26e47725c08a0d3aebfb65 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| @@ -115,8 +115,10 @@ static void domStringOrDoubleOrNullAttributeAttributeSetterCallback(const v8::Fu
|
|
|
| static void voidMethodArrayOfLongsArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodArrayOfLongsArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "voidMethodArrayOfLongsArg");
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| Vector<int> arrayOfLongsArg;
|
| {
|
| int numArgsPassed = info.Length();
|
| @@ -143,12 +145,15 @@ static void voidMethodArrayOfLongsArgMethodCallback(const v8::FunctionCallbackIn
|
|
|
| static void voidMethodFloatArgStringArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodFloatArgStringArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "voidMethodFloatArgStringArg");
|
| +
|
| if (UNLIKELY(info.Length() < 2)) {
|
| - setMinimumArityTypeError(exceptionState, 2, info.Length());
|
| + throwMinimumArityError(exceptionState, 2, info.Length());
|
| return;
|
| }
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| float floatArg;
|
| V8StringResource<> stringArg;
|
| {
|
| @@ -170,10 +175,12 @@ static void voidMethodFloatArgStringArgMethodCallback(const v8::FunctionCallback
|
| static void voidMethodTestCallbackInterfaceTypeArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - V8ThrowException::throwException(info.GetIsolate(), createMinimumArityTypeErrorForMethod(info.GetIsolate(), "voidMethodTestCallbackInterfaceTypeArg", "TestTypedefs", 1, info.Length()));
|
| + throwMinimumArityErrorForMethod(info.GetIsolate(), "TestTypedefs", "voidMethodTestCallbackInterfaceTypeArg", 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| TestCallbackInterface* testCallbackInterfaceTypeArg;
|
| {
|
| if (info.Length() <= 0 || !info[0]->IsFunction()) {
|
| @@ -192,12 +199,15 @@ static void voidMethodTestCallbackInterfaceTypeArgMethodCallback(const v8::Funct
|
|
|
| static void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "uLongLongMethodTestInterfaceEmptyTypeSequenceArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "uLongLongMethodTestInterfaceEmptyTypeSequenceArg");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| HeapVector<Member<TestInterfaceEmpty>> testInterfaceEmptyTypeSequenceArg;
|
| {
|
| testInterfaceEmptyTypeSequenceArg = (toMemberNativeArray<TestInterfaceEmpty>(info[0], 1, info.GetIsolate(), exceptionState));
|
| @@ -215,6 +225,7 @@ static void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethodCallback(const
|
| static void testInterfaceOrTestInterfaceEmptyMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| TestInterfaceOrTestInterfaceEmpty result;
|
| impl->testInterfaceOrTestInterfaceEmptyMethod(result);
|
| v8SetReturnValue(info, result);
|
| @@ -228,6 +239,7 @@ static void testInterfaceOrTestInterfaceEmptyMethodMethodCallback(const v8::Func
|
| static void domStringOrDoubleMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| StringOrDouble result;
|
| impl->domStringOrDoubleMethod(result);
|
| v8SetReturnValue(info, result);
|
| @@ -240,12 +252,15 @@ static void domStringOrDoubleMethodMethodCallback(const v8::FunctionCallbackInfo
|
|
|
| static void arrayOfStringsMethodArrayOfStringsArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "arrayOfStringsMethodArrayOfStringsArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "arrayOfStringsMethodArrayOfStringsArg");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| Vector<String> arrayOfStringsArg;
|
| {
|
| arrayOfStringsArg = toImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| @@ -262,12 +277,15 @@ static void arrayOfStringsMethodArrayOfStringsArgMethodCallback(const v8::Functi
|
|
|
| static void stringArrayMethodStringArrayArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ExecutionContext, "stringArrayMethodStringArrayArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestTypedefs", "stringArrayMethodStringArrayArg");
|
| +
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| + throwMinimumArityError(exceptionState, 1, info.Length());
|
| return;
|
| }
|
| +
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| +
|
| Vector<String> stringArrayArg;
|
| {
|
| stringArrayArg = toImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| @@ -285,7 +303,7 @@ static void stringArrayMethodStringArrayArgMethodCallback(const v8::FunctionCall
|
| static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| if (UNLIKELY(info.Length() < 1)) {
|
| - V8ThrowException::throwException(info.GetIsolate(), createMinimumArityTypeErrorForConstructor(info.GetIsolate(), "TestTypedefs", 1, info.Length()));
|
| + throwMinimumArityErrorForConstructor(info.GetIsolate(), "TestTypedefs", 1, info.Length());
|
| return;
|
| }
|
| V8StringResource<> stringArg;
|
|
|