| Index: third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp b/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| index 8488587c6f14985c09b5be2888c8b8d54f51952c..42d7ee065efb5ecff704dc27f33bf4dc67690d07 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| @@ -74,7 +74,6 @@ static void testInterfaceAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| TestInterface5Implementation* cppValue = V8TestInterface5::toImplWithTypeCheck(info.GetIsolate(), v8Value);
|
| if (!cppValue) {
|
| exceptionState.throwTypeError("The provided value is not of type 'TestInterface5'.");
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| impl->setTestInterfaceAttribute(cppValue);
|
| @@ -104,7 +103,7 @@ static void doubleAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "doubleAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| double cppValue = toRestrictedDouble(info.GetIsolate(), v8Value, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setDoubleAttribute(cppValue);
|
| }
|
| @@ -133,7 +132,7 @@ static void floatAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "floatAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| float cppValue = toRestrictedFloat(info.GetIsolate(), v8Value, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setFloatAttribute(cppValue);
|
| }
|
| @@ -162,7 +161,7 @@ static void unrestrictedDoubleAttributeAttributeSetter(v8::Local<v8::Value> v8Va
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedDoubleAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| double cppValue = toDouble(info.GetIsolate(), v8Value, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setUnrestrictedDoubleAttribute(cppValue);
|
| }
|
| @@ -191,7 +190,7 @@ static void unrestrictedFloatAttributeAttributeSetter(v8::Local<v8::Value> v8Val
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedFloatAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| float cppValue = toFloat(info.GetIsolate(), v8Value, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setUnrestrictedFloatAttribute(cppValue);
|
| }
|
| @@ -244,7 +243,7 @@ static void alwaysExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "alwaysExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setAlwaysExposedAttribute(cppValue);
|
| }
|
| @@ -273,7 +272,7 @@ static void workerExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "workerExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setWorkerExposedAttribute(cppValue);
|
| }
|
| @@ -302,7 +301,7 @@ static void windowExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "windowExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| impl->setWindowExposedAttribute(cppValue);
|
| }
|
| @@ -341,7 +340,6 @@ static void voidMethodDoubleArgFloatArgMethod(const v8::FunctionCallbackInfo<v8:
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodDoubleArgFloatArg", "TestInterface5", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| setMinimumArityTypeError(exceptionState, 2, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| @@ -349,10 +347,10 @@ static void voidMethodDoubleArgFloatArgMethod(const v8::FunctionCallbackInfo<v8:
|
| float floatArg;
|
| {
|
| doubleArg = toRestrictedDouble(info.GetIsolate(), info[0], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| floatArg = toRestrictedFloat(info.GetIsolate(), info[1], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| }
|
| impl->voidMethodDoubleArgFloatArg(doubleArg, floatArg);
|
| @@ -368,7 +366,6 @@ static void voidMethodUnrestrictedDoubleArgUnrestrictedFloatArgMethod(const v8::
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodUnrestrictedDoubleArgUnrestrictedFloatArg", "TestInterface5", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| setMinimumArityTypeError(exceptionState, 2, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| @@ -376,10 +373,10 @@ static void voidMethodUnrestrictedDoubleArgUnrestrictedFloatArgMethod(const v8::
|
| float unrestrictedFloatArg;
|
| {
|
| unrestrictedDoubleArg = toDouble(info.GetIsolate(), info[0], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| unrestrictedFloatArg = toFloat(info.GetIsolate(), info[1], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| }
|
| impl->voidMethodUnrestrictedDoubleArgUnrestrictedFloatArg(unrestrictedDoubleArg, unrestrictedFloatArg);
|
| @@ -491,14 +488,13 @@ static void voidMethodBooleanOrDOMStringArgMethod(const v8::FunctionCallbackInfo
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodBooleanOrDOMStringArg", "TestInterface5", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| BooleanOrString arg;
|
| {
|
| V8BooleanOrString::toImpl(info.GetIsolate(), info[0], arg, UnionTypeConversionMode::NotNullable, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| }
|
| impl->voidMethodBooleanOrDOMStringArg(arg);
|
| @@ -514,14 +510,13 @@ static void voidMethodDoubleOrDOMStringArgMethod(const v8::FunctionCallbackInfo<
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodDoubleOrDOMStringArg", "TestInterface5", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| DoubleOrString arg;
|
| {
|
| V8DoubleOrString::toImpl(info.GetIsolate(), info[0], arg, UnionTypeConversionMode::NotNullable, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| }
|
| impl->voidMethodDoubleOrDOMStringArg(arg);
|
| @@ -539,7 +534,6 @@ static void keysMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->keysForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValue(info, result);
|
| @@ -557,7 +551,6 @@ static void valuesMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->valuesForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValue(info, result);
|
| @@ -575,7 +568,6 @@ static void entriesMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->entriesForBinding(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValue(info, result);
|
| @@ -591,7 +583,6 @@ static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "forEach", "TestInterface5", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 1)) {
|
| setMinimumArityTypeError(exceptionState, 1, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| @@ -600,7 +591,6 @@ static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| if (!info[0]->IsFunction()) {
|
| exceptionState.throwTypeError("The callback provided as parameter 1 is not a function.");
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| callback = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
|
| @@ -609,7 +599,6 @@ static void forEachMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| impl->forEachForBinding(scriptState, ScriptValue(scriptState, info.Holder()), callback, thisArg, exceptionState);
|
| if (exceptionState.hadException()) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| }
|
| @@ -637,7 +626,6 @@ static void iteratorMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ScriptState* scriptState = ScriptState::forReceiverObject(info);
|
| Iterator* result = impl->iterator(scriptState, exceptionState);
|
| if (exceptionState.hadException()) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValue(info, result);
|
| @@ -740,7 +728,7 @@ static void namedPropertyQuery(v8::Local<v8::Name> name, const v8::PropertyCallb
|
| v8::String::Utf8Value namedProperty(name);
|
| ExceptionState exceptionState(ExceptionState::GetterContext, *namedProperty, "TestInterface5", info.Holder(), info.GetIsolate());
|
| bool result = impl->namedPropertyQuery(propertyName, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| if (!result)
|
| return;
|
| @@ -776,7 +764,7 @@ static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& i
|
| Vector<String> names;
|
| ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestInterface5", info.Holder(), info.GetIsolate());
|
| impl->namedPropertyEnumerator(names, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException())
|
| return;
|
| v8::Local<v8::Array> v8names = v8::Array::New(info.GetIsolate(), names.size());
|
| for (size_t i = 0; i < names.size(); ++i) {
|
|
|