Index: Source/bindings/tests/results/core/V8TestInterface2.cpp |
diff --git a/Source/bindings/tests/results/core/V8TestInterface2.cpp b/Source/bindings/tests/results/core/V8TestInterface2.cpp |
index 0cc9dab31802ee5058f37a98a8407a8d2541b8ef..1621dd5f40e27649df9ed3dcb25338be7ce73f43 100644 |
--- a/Source/bindings/tests/results/core/V8TestInterface2.cpp |
+++ b/Source/bindings/tests/results/core/V8TestInterface2.cpp |
@@ -47,7 +47,7 @@ static void itemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
TestInterface2* impl = V8TestInterface2::toImpl(info.Holder()); |
unsigned index; |
{ |
- TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(index, toUInt32(info[0], exceptionState), exceptionState); |
+ TONATIVE_CONVERT(convertAndThrow(index = toUInt32(info[0], exceptionState), exceptionState), return); |
} |
RefPtr<TestInterfaceEmpty> result = impl->item(index, exceptionState); |
if (exceptionState.hadException()) { |
@@ -76,7 +76,7 @@ static void setItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
unsigned index; |
TestInterfaceEmpty* value; |
{ |
- TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(index, toUInt32(info[0], exceptionState), exceptionState); |
+ TONATIVE_CONVERT(convertAndThrow(index = toUInt32(info[0], exceptionState), exceptionState), return); |
value = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[1]); |
if (!value) { |
exceptionState.throwTypeError("parameter 2 is not of type 'TestInterfaceEmpty'."); |
@@ -110,7 +110,7 @@ static void deleteItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
TestInterface2* impl = V8TestInterface2::toImpl(info.Holder()); |
unsigned index; |
{ |
- TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(index, toUInt32(info[0], exceptionState), exceptionState); |
+ TONATIVE_CONVERT(convertAndThrow(index = toUInt32(info[0], exceptionState), exceptionState), return); |
} |
bool result = impl->deleteItem(index, exceptionState); |
if (exceptionState.hadException()) { |
@@ -138,7 +138,7 @@ static void namedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
TestInterface2* impl = V8TestInterface2::toImpl(info.Holder()); |
V8StringResource<> name; |
{ |
- TOSTRING_VOID_INTERNAL(name, info[0]); |
+ TONATIVE_CONVERT((name = info[0]).prepare(), return); |
} |
RefPtr<TestInterfaceEmpty> result = impl->namedItem(name, exceptionState); |
if (exceptionState.hadException()) { |
@@ -167,7 +167,7 @@ static void setNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
V8StringResource<> name; |
TestInterfaceEmpty* value; |
{ |
- TOSTRING_VOID_INTERNAL(name, info[0]); |
+ TONATIVE_CONVERT((name = info[0]).prepare(), return); |
value = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[1]); |
if (!value && !isUndefinedOrNull(info[1])) { |
exceptionState.throwTypeError("parameter 2 is not of type 'TestInterfaceEmpty'."); |
@@ -201,7 +201,7 @@ static void deleteNamedItemMethod(const v8::FunctionCallbackInfo<v8::Value>& inf |
TestInterface2* impl = V8TestInterface2::toImpl(info.Holder()); |
V8StringResource<> name; |
{ |
- TOSTRING_VOID_INTERNAL(name, info[0]); |
+ TONATIVE_CONVERT((name = info[0]).prepare(), return); |
} |
bool result = impl->deleteNamedItem(name, exceptionState); |
if (exceptionState.hadException()) { |
@@ -305,7 +305,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]); |