| 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 b4fcd14938d677143ae0d3fb48578814659bb255..b14344358b4f74daead73292c071bbad006a73d2 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp
|
| @@ -57,8 +57,9 @@ static void uLongLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, cons
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "uLongLongAttribute", "TestTypedefs", holder, info.GetIsolate());
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(holder);
|
| unsigned long long cppValue = toUInt64(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setULongLongAttribute(cppValue);
|
| }
|
|
|
| @@ -89,8 +90,9 @@ static void domStringOrDoubleOrNullAttributeAttributeSetter(v8::Local<v8::Value>
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(holder);
|
| StringOrDouble cppValue;
|
| V8StringOrDouble::toImpl(info.GetIsolate(), v8Value, cppValue, UnionTypeConversionMode::Nullable, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setDomStringOrDoubleOrNullAttribute(cppValue);
|
| }
|
|
|
| @@ -117,8 +119,9 @@ static void voidMethodArrayOfLongsArgMethod(const v8::FunctionCallbackInfo<v8::V
|
| return;
|
| }
|
| arrayOfLongsArg = toImplArray<Vector<int>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| }
|
| impl->voidMethodArrayOfLongsArg(arrayOfLongsArg);
|
| }
|
| @@ -133,7 +136,6 @@ static void voidMethodFloatArgStringArgMethod(const v8::FunctionCallbackInfo<v8:
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodFloatArgStringArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| setMinimumArityTypeError(exceptionState, 2, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| @@ -141,11 +143,13 @@ static void voidMethodFloatArgStringArgMethod(const v8::FunctionCallbackInfo<v8:
|
| V8StringResource<> stringArg;
|
| {
|
| floatArg = toRestrictedFloat(info.GetIsolate(), info[0], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| stringArg = info[1];
|
| - if (!stringArg.prepare())
|
| + if (!stringArg.prepare()) {
|
| return;
|
| + }
|
| }
|
| impl->voidMethodFloatArgStringArg(floatArg, stringArg);
|
| }
|
| @@ -183,15 +187,15 @@ static void uLongLongMethodTestInterfaceEmptyTypeSequenceArgMethod(const v8::Fun
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "uLongLongMethodTestInterfaceEmptyTypeSequenceArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| HeapVector<Member<TestInterfaceEmpty>> testInterfaceEmptyTypeSequenceArg;
|
| {
|
| testInterfaceEmptyTypeSequenceArg = (toMemberNativeArray<TestInterfaceEmpty>(info[0], 1, info.GetIsolate(), exceptionState));
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| }
|
| v8SetReturnValue(info, static_cast<double>(impl->uLongLongMethodTestInterfaceEmptyTypeSequenceArg(testInterfaceEmptyTypeSequenceArg)));
|
| }
|
| @@ -232,15 +236,15 @@ static void arrayOfStringsMethodArrayOfStringsArgMethod(const v8::FunctionCallba
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "arrayOfStringsMethodArrayOfStringsArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| Vector<String> arrayOfStringsArg;
|
| {
|
| arrayOfStringsArg = toImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| }
|
| v8SetReturnValue(info, toV8(impl->arrayOfStringsMethodArrayOfStringsArg(arrayOfStringsArg), info.Holder(), info.GetIsolate()));
|
| }
|
| @@ -255,15 +259,15 @@ static void stringArrayMethodStringArrayArgMethod(const v8::FunctionCallbackInfo
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "stringArrayMethodStringArrayArg", "TestTypedefs", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestTypedefs* impl = V8TestTypedefs::toImpl(info.Holder());
|
| Vector<String> stringArrayArg;
|
| {
|
| stringArrayArg = toImplArray<Vector<String>>(info[0], 1, info.GetIsolate(), exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| }
|
| v8SetReturnValue(info, toV8(impl->stringArrayMethodStringArrayArg(stringArrayArg), info.Holder(), info.GetIsolate()));
|
| }
|
| @@ -282,8 +286,9 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| V8StringResource<> stringArg;
|
| {
|
| stringArg = info[0];
|
| - if (!stringArg.prepare())
|
| + if (!stringArg.prepare()) {
|
| return;
|
| + }
|
| }
|
| TestTypedefs* impl = TestTypedefs::create(stringArg);
|
| v8::Local<v8::Object> wrapper = info.Holder();
|
|
|