| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceOriginTrialEnabled.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceOriginTrialEnabled.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceOriginTrialEnabled.cpp
|
| index d0f0e7787e91bb3a19b5e88e2e8725383fb09af9..8ae810fdcb48e12d440de97aa9696a067d6d6b14 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceOriginTrialEnabled.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceOriginTrialEnabled.cpp
|
| @@ -52,8 +52,9 @@ static void doubleAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "doubleAttribute", "TestInterfaceOriginTrialEnabled", holder, info.GetIsolate());
|
| TestInterfaceOriginTrialEnabled* impl = V8TestInterfaceOriginTrialEnabled::toImpl(holder);
|
| double cppValue = toRestrictedDouble(info.GetIsolate(), v8Value, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setDoubleAttribute(cppValue);
|
| }
|
|
|
| @@ -81,8 +82,9 @@ static void conditionalLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "conditionalLongAttribute", "TestInterfaceOriginTrialEnabled", holder, info.GetIsolate());
|
| TestInterfaceOriginTrialEnabled* impl = V8TestInterfaceOriginTrialEnabled::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setConditionalLongAttribute(cppValue);
|
| }
|
|
|
| @@ -117,8 +119,9 @@ static void staticStringAttributeAttributeGetterCallback(const v8::FunctionCallb
|
| static void staticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| V8StringResource<> cppValue = v8Value;
|
| - if (!cppValue.prepare())
|
| + if (!cppValue.prepare()) {
|
| return;
|
| + }
|
| TestInterfaceOriginTrialEnabled::setStaticStringAttribute(cppValue);
|
| }
|
|
|
| @@ -143,7 +146,6 @@ static void voidMethodDoubleArgFloatArgMethod(const v8::FunctionCallbackInfo<v8:
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodDoubleArgFloatArg", "TestInterfaceOriginTrialEnabled", info.Holder(), info.GetIsolate());
|
| if (UNLIKELY(info.Length() < 2)) {
|
| setMinimumArityTypeError(exceptionState, 2, info.Length());
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| TestInterfaceOriginTrialEnabled* impl = V8TestInterfaceOriginTrialEnabled::toImpl(info.Holder());
|
| @@ -151,11 +153,13 @@ 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);
|
| }
|
| @@ -178,8 +182,9 @@ static void voidMethodPartialOverload2Method(const v8::FunctionCallbackInfo<v8::
|
| double doubleArg;
|
| {
|
| doubleArg = toRestrictedDouble(info.GetIsolate(), info[0], exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| }
|
| impl->voidMethodPartialOverload(doubleArg);
|
| }
|
| @@ -204,7 +209,6 @@ static void voidMethodPartialOverloadMethod(const v8::FunctionCallbackInfo<v8::V
|
| break;
|
| }
|
| exceptionState.throwTypeError("No function was found that matched the signature provided.");
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
|
|
|
|