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 08713f4d8778ab73a081dfa1d9975f05bfce05d8..a388014b132c2acd64e96febc7630e5519fe8c53 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestTypedefs.cpp |
@@ -70,7 +70,7 @@ 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); |
} |
@@ -102,7 +102,7 @@ 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); |
} |
@@ -130,7 +130,7 @@ 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); |
@@ -146,7 +146,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()); |
@@ -154,7 +153,7 @@ 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()) |
@@ -196,14 +195,13 @@ 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))); |
@@ -245,14 +243,13 @@ 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())); |
@@ -268,14 +265,13 @@ 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())); |