IDL: Simplify [TypeChecking=Interface] code generation

Source/bindings/tests/results/core/V8TestInterface.cpp

Index: Source/bindings/tests/results/core/V8TestInterface.cpp
diff --git a/Source/bindings/tests/results/core/V8TestInterface.cpp b/Source/bindings/tests/results/core/V8TestInterface.cpp
index 9de82c9e2075e461a80077592527421dd4cf9155..96db7eeeb4107220e03cb367e20ebce734d5cfae 100644
--- a/Source/bindings/tests/results/core/V8TestInterface.cpp
+++ b/Source/bindings/tests/results/core/V8TestInterface.cpp
@@ -72,13 +72,13 @@ static void testInterfaceAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
 {
     v8::Handle<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "testInterfaceAttribute", "TestInterface", holder, info.GetIsolate());
-    if (!V8TestInterface::hasInstance(v8Value, info.GetIsolate())) {
+    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
+    TestInterfaceImplementation* cppValue = V8TestInterface::toImplWithTypeCheck(info.GetIsolate(), v8Value);
+    if (!cppValue) {
         exceptionState.throwTypeError("The provided value is not of type 'TestInterface'.");
         exceptionState.throwIfNeeded();
         return;
     }
-    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    TestInterfaceImplementation* cppValue = V8TestInterface::toImpl(v8::Handle<v8::Object>::Cast(v8Value));
     impl->setTestInterfaceAttribute(WTF::getPtr(cppValue));
 }
 
@@ -432,13 +432,13 @@ static void implementsNodeAttributeAttributeSetter(v8::Local<v8::Value> v8Value,
 {
     v8::Handle<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "implementsNodeAttribute", "TestInterface", holder, info.GetIsolate());
-    if (!V8Node::hasInstance(v8Value, info.GetIsolate())) {
+    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
+    Node* cppValue = V8Node::toImplWithTypeCheck(info.GetIsolate(), v8Value);
+    if (!cppValue) {
         exceptionState.throwTypeError("The provided value is not of type 'Node'.");
         exceptionState.throwIfNeeded();
         return;
     }
-    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    Node* cppValue = V8Node::toImpl(v8::Handle<v8::Object>::Cast(v8Value));
     impl->setImplementsNodeAttribute(WTF::getPtr(cppValue));
 }
 
@@ -497,13 +497,13 @@ static void implementsRuntimeEnabledNodeAttributeAttributeSetter(v8::Local<v8::V
 {
     v8::Handle<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "implementsRuntimeEnabledNodeAttribute", "TestInterface", holder, info.GetIsolate());
-    if (!V8Node::hasInstance(v8Value, info.GetIsolate())) {
+    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
+    Node* cppValue = V8Node::toImplWithTypeCheck(info.GetIsolate(), v8Value);
+    if (!cppValue) {
         exceptionState.throwTypeError("The provided value is not of type 'Node'.");
         exceptionState.throwIfNeeded();
         return;
     }
-    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    Node* cppValue = V8Node::toImpl(v8::Handle<v8::Object>::Cast(v8Value));
     impl->setImplementsRuntimeEnabledNodeAttribute(WTF::getPtr(cppValue));
 }
 
@@ -532,13 +532,13 @@ static void implementsPerContextEnabledNodeAttributeAttributeSetter(v8::Local<v8
 {
     v8::Handle<v8::Object> holder = info.Holder();
     ExceptionState exceptionState(ExceptionState::SetterContext, "implementsPerContextEnabledNodeAttribute", "TestInterface", holder, info.GetIsolate());
-    if (!V8Node::hasInstance(v8Value, info.GetIsolate())) {
+    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
+    Node* cppValue = V8Node::toImplWithTypeCheck(info.GetIsolate(), v8Value);
+    if (!cppValue) {
         exceptionState.throwTypeError("The provided value is not of type 'Node'.");
         exceptionState.throwIfNeeded();
         return;
     }
-    TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder);
-    Node* cppValue = V8Node::toImpl(v8::Handle<v8::Object>::Cast(v8Value));
     impl->setImplementsPerContextEnabledNodeAttribute(WTF::getPtr(cppValue));
 }
 
@@ -935,11 +935,11 @@ static void voidMethodTestInterfaceEmptyArgMethod(const v8::FunctionCallbackInfo
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     TestInterfaceEmpty* testInterfaceEmptyArg;
     {
-        if (info.Length() > 0 && !V8TestInterfaceEmpty::hasInstance(info[0], info.GetIsolate())) {
+        testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[0]);
+        if (!testInterfaceEmptyArg) {
             V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodTestInterfaceEmptyArg", "TestInterface", "parameter 1 is not of type 'TestInterfaceEmpty'."));
             return;
         }
-        testInterfaceEmptyArg = V8TestInterfaceEmpty::toImpl(v8::Handle<v8::Object>::Cast(info[0]));
     }
     impl->voidMethodTestInterfaceEmptyArg(testInterfaceEmptyArg);
 }
@@ -1151,11 +1151,11 @@ static void overloadMethodWithExposedAndRuntimeEnabledFlag3Method(const v8::Func
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     DOMWindow* window;
     {
-        if (info.Length() > 0 && !V8Window::hasInstance(info[0], info.GetIsolate())) {
+        window = toDOMWindow(info.GetIsolate(), info[0]);

[Jens Widell, 2014/12/18 13:47:05]

This is a real change; toDOMWindow() does not just use V8Window::hasInstance()
to check the type. The new code is better, I think.

This doesn't affect any real methods. Window arguments aren't that common, and
apparently none of them have [TypeChecking=Interface].

[haraken, 2014/12/18 14:50:27]

I'm pretty sure that the new code is more correct. In the previous code,
|window| can become 0 in edge cases.

+        if (!window) {
             V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("overloadMethodWithExposedAndRuntimeEnabledFlag", "TestInterface", "parameter 1 is not of type 'Window'."));
             return;
         }
-        window = toDOMWindow(info.GetIsolate(), info[0]);
     }
     impl->overloadMethodWithExposedAndRuntimeEnabledFlag(window);
 }
@@ -1269,11 +1269,11 @@ static void promiseMethodPartialOverload2Method(const v8::FunctionCallbackInfo<v
     TestInterfaceImplementation* impl = V8TestInterface::toImpl(info.Holder());
     DOMWindow* window;
     {
-        if (info.Length() > 0 && !V8Window::hasInstance(info[0], info.GetIsolate())) {
+        window = toDOMWindow(info.GetIsolate(), info[0]);
+        if (!window) {
             v8SetReturnValue(info, ScriptPromise::rejectRaw(info.GetIsolate(), V8ThrowException::createTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("promiseMethodPartialOverload", "TestInterface", "parameter 1 is not of type 'Window'."))));
             return;
         }
-        window = toDOMWindow(info.GetIsolate(), info[0]);
     }
     v8SetReturnValue(info, impl->promiseMethodPartialOverload(window).v8Value());
 }
@@ -1309,12 +1309,12 @@ static void implementsComplexMethodMethod(const v8::FunctionCallbackInfo<v8::Val
     TestInterfaceEmpty* testInterfaceEmptyArg;
     {
         TOSTRING_VOID_INTERNAL(strArg, info[0]);
-        if (info.Length() > 1 && !V8TestInterfaceEmpty::hasInstance(info[1], info.GetIsolate())) {
+        testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[1]);
+        if (!testInterfaceEmptyArg) {
             exceptionState.throwTypeError("parameter 2 is not of type 'TestInterfaceEmpty'.");
             exceptionState.throwIfNeeded();
             return;
         }
-        testInterfaceEmptyArg = V8TestInterfaceEmpty::toImpl(v8::Handle<v8::Object>::Cast(info[1]));
     }
     ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
     RefPtr<TestInterfaceEmpty> result = impl->implementsComplexMethod(executionContext, strArg, testInterfaceEmptyArg, exceptionState);