| Index: Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| diff --git a/Source/bindings/tests/results/modules/V8TestInterface5.cpp b/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| index 9e72b64efc81af01e2d1d0224b6a80c3cd063ed5..0ee541ac3b0459358f1b356b3cffa57a45cc098a 100644
|
| --- a/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| +++ b/Source/bindings/tests/results/modules/V8TestInterface5.cpp
|
| @@ -90,7 +90,7 @@ static void doubleAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "doubleAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(double, cppValue, toRestrictedDouble(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(double, cppValue, convertAndThrow(cppValue = toRestrictedDouble(v8Value, exceptionState), exceptionState), return);
|
| impl->setDoubleAttribute(cppValue);
|
| }
|
|
|
| @@ -120,7 +120,7 @@ static void floatAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "floatAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(float, cppValue, toRestrictedFloat(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(float, cppValue, convertAndThrow(cppValue = toRestrictedFloat(v8Value, exceptionState), exceptionState), return);
|
| impl->setFloatAttribute(cppValue);
|
| }
|
|
|
| @@ -150,7 +150,7 @@ static void unrestrictedDoubleAttributeAttributeSetter(v8::Local<v8::Value> v8Va
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedDoubleAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(double, cppValue, toDouble(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(double, cppValue, convertAndThrow(cppValue = toDouble(v8Value, exceptionState), exceptionState), return);
|
| impl->setUnrestrictedDoubleAttribute(cppValue);
|
| }
|
|
|
| @@ -180,7 +180,7 @@ static void unrestrictedFloatAttributeAttributeSetter(v8::Local<v8::Value> v8Val
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "unrestrictedFloatAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(float, cppValue, toFloat(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(float, cppValue, convertAndThrow(cppValue = toFloat(v8Value, exceptionState), exceptionState), return);
|
| impl->setUnrestrictedFloatAttribute(cppValue);
|
| }
|
|
|
| @@ -205,7 +205,7 @@ static void staticStringAttributeAttributeGetterCallback(v8::Local<v8::String>,
|
|
|
| static void staticStringAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info)
|
| {
|
| - TOSTRING_VOID(V8StringResource<>, cppValue, v8Value);
|
| + TONATIVE_DECLARE(V8StringResource<>, cppValue, (cppValue = v8Value).prepare(), return);
|
| TestInterface5Implementation::setStaticStringAttribute(cppValue);
|
| }
|
|
|
| @@ -235,7 +235,7 @@ static void alwaysExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "alwaysExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
|
| impl->setAlwaysExposedAttribute(cppValue);
|
| }
|
|
|
| @@ -265,7 +265,7 @@ static void workerExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "workerExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
|
| impl->setWorkerExposedAttribute(cppValue);
|
| }
|
|
|
| @@ -295,7 +295,7 @@ static void windowExposedAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "windowExposedAttribute", "TestInterface5", holder, info.GetIsolate());
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(holder);
|
| - TONATIVE_VOID_EXCEPTIONSTATE(int, cppValue, toInt32(v8Value, exceptionState), exceptionState);
|
| + TONATIVE_DECLARE(int, cppValue, convertAndThrow(cppValue = toInt32(v8Value, exceptionState), exceptionState), return);
|
| impl->setWindowExposedAttribute(cppValue);
|
| }
|
|
|
| @@ -364,8 +364,8 @@ static void voidMethodDoubleArgFloatArgMethod(const v8::FunctionCallbackInfo<v8:
|
| double doubleArg;
|
| float floatArg;
|
| {
|
| - TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(doubleArg, toRestrictedDouble(info[0], exceptionState), exceptionState);
|
| - TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(floatArg, toRestrictedFloat(info[1], exceptionState), exceptionState);
|
| + TONATIVE_CONVERT(convertAndThrow(doubleArg = toRestrictedDouble(info[0], exceptionState), exceptionState), return);
|
| + TONATIVE_CONVERT(convertAndThrow(floatArg = toRestrictedFloat(info[1], exceptionState), exceptionState), return);
|
| }
|
| impl->voidMethodDoubleArgFloatArg(doubleArg, floatArg);
|
| }
|
| @@ -389,8 +389,8 @@ static void voidMethodUnrestrictedDoubleArgUnrestrictedFloatArgMethod(const v8::
|
| double unrestrictedDoubleArg;
|
| float unrestrictedFloatArg;
|
| {
|
| - TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(unrestrictedDoubleArg, toDouble(info[0], exceptionState), exceptionState);
|
| - TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(unrestrictedFloatArg, toFloat(info[1], exceptionState), exceptionState);
|
| + TONATIVE_CONVERT(convertAndThrow(unrestrictedDoubleArg = toDouble(info[0], exceptionState), exceptionState), return);
|
| + TONATIVE_CONVERT(convertAndThrow(unrestrictedFloatArg = toFloat(info[1], exceptionState), exceptionState), return);
|
| }
|
| impl->voidMethodUnrestrictedDoubleArgUnrestrictedFloatArg(unrestrictedDoubleArg, unrestrictedFloatArg);
|
| }
|
| @@ -527,7 +527,7 @@ static void voidMethodBooleanOrDOMStringArgMethod(const v8::FunctionCallbackInfo
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| BooleanOrString arg;
|
| {
|
| - TONATIVE_VOID_EXCEPTIONSTATE_ARGINTERNAL(V8BooleanOrString::toImpl(info.GetIsolate(), info[0], arg, exceptionState), exceptionState);
|
| + TONATIVE_CONVERT(V8BooleanOrString::toImpl(info.GetIsolate(), info[0], arg, exceptionState), return exceptionState.throwException());
|
| }
|
| impl->voidMethodBooleanOrDOMStringArg(arg);
|
| }
|
| @@ -550,7 +550,7 @@ static void voidMethodDoubleOrDOMStringArgMethod(const v8::FunctionCallbackInfo<
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| DoubleOrString arg;
|
| {
|
| - TONATIVE_VOID_EXCEPTIONSTATE_ARGINTERNAL(V8DoubleOrString::toImpl(info.GetIsolate(), info[0], arg, exceptionState), exceptionState);
|
| + TONATIVE_CONVERT(V8DoubleOrString::toImpl(info.GetIsolate(), info[0], arg, exceptionState), return exceptionState.throwException());
|
| }
|
| impl->voidMethodDoubleOrDOMStringArg(arg);
|
| }
|
| @@ -636,7 +636,7 @@ 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();
|
| + exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| callback = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
|
| @@ -709,7 +709,7 @@ static void indexedPropertyGetterCallback(uint32_t index, const v8::PropertyCall
|
| static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| - TOSTRING_VOID(V8StringResource<>, propertyValue, v8Value);
|
| + TONATIVE_DECLARE(V8StringResource<>, propertyValue, (propertyValue = v8Value).prepare(), return);
|
| bool result = impl->anonymousIndexedSetter(index, propertyValue);
|
| if (!result)
|
| return;
|
| @@ -775,7 +775,7 @@ static void namedPropertySetter(v8::Local<v8::Name> name, v8::Local<v8::Value> v
|
|
|
| TestInterface5Implementation* impl = V8TestInterface5::toImpl(info.Holder());
|
| TOSTRING_VOID(V8StringResource<>, propertyName, nameString);
|
| - TOSTRING_VOID(V8StringResource<>, propertyValue, v8Value);
|
| + TONATIVE_DECLARE(V8StringResource<>, propertyValue, (propertyValue = v8Value).prepare(), return);
|
| bool result = impl->anonymousNamedSetter(propertyName, propertyValue);
|
| if (!result)
|
| return;
|
|
|