Simplify invokeCallback() and support void return values for IDL callbacks

Source/bindings/tests/results/V8TestCallback.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 
 #include "V8TestInterfaceEmpty.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8Callback.h"
 #include "core/dom/ExecutionContext.h"
 #include "wtf/Assertions.h"
 #include "wtf/GetPtr.h"
 #include "wtf/RefPtr.h"
 namespace WebCore {
 
-V8TestCallback::V8TestCallback(v8::Handle<v8::Object> callback, ExecutionContext* context)
+V8TestCallback::V8TestCallback(v8::Handle<v8::Function> callback, ExecutionContext* context)
     : ActiveDOMCallback(context)
     , m_callback(toIsolate(context), callback)
     , m_world(DOMWrapperWorld::current())
 {
 }
 
 V8TestCallback::~V8TestCallback()
 {
 }
 
 bool V8TestCallback::callbackWithNoArg()
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> *argv = 0;
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 0, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithTestInterfaceEmptyArg(TestInterfaceEmpty* class1Arg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> class1ArgHandle = toV8(class1Arg, v8::Handle<v8::Object>(), isolate);
     if (class1ArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { class1ArgHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 1, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithTestInterfaceEmptyArg(TestInterfaceEmpty* class2Arg, const String& strArg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> class2ArgHandle = toV8(class2Arg, v8::Handle<v8::Object>(), isolate);
     if (class2ArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> strArgHandle = v8String(isolate, strArg);
     if (strArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { class2ArgHandle, strArgHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 2, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 2, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithBooleanArg(bool boolArg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> boolArgHandle = v8Boolean(boolArg, isolate);
     if (boolArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { boolArgHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 1, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithSequenceArg(const Vector<RefPtr<TestInterfaceEmpty> >& sequenceArg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> sequenceArgHandle = v8Array(sequenceArg, isolate);
     if (sequenceArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { sequenceArgHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 1, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithFloatArg(float floatArg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
         return true;
 
     v8::Context::Scope scope(v8Context);
     v8::Handle<v8::Value> floatArgHandle = v8::Number::New(isolate, floatArg);
     if (floatArgHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { floatArgHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), 1, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), 1, argv, executionContext(), isolate);
 }
 
 bool V8TestCallback::callbackWithThisArg(ScriptValue thisValue, int arg)
 {
     if (!canInvokeCallback())
         return true;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
@@ skipping 10 matching lines @@
     }
     ASSERT(thisHandle->IsObject());
     v8::Handle<v8::Value> argHandle = v8::Integer::New(isolate, arg);
     if (argHandle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         return true;
     }
     v8::Handle<v8::Value> argv[] = { argHandle };
 
-    bool callbackReturnValue = false;
-    return !invokeCallback(m_callback.newLocal(isolate), v8::Handle<v8::Object>::Cast(thisHandle), 1, argv, callbackReturnValue, executionContext(), isolate);
+    return invokeCallback(m_callback.newLocal(isolate), v8::Handle<v8::Object>::Cast(thisHandle), 1, argv, executionContext(), isolate);
+}
+
+void V8TestCallback::callbackWithVoidReturnValue()
+{
+    if (!canInvokeCallback())
+        return;
+
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::HandleScope handleScope(isolate);
+
+    v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
+    if (v8Context.IsEmpty())
+        return;
+
+    v8::Context::Scope scope(v8Context);
+    v8::Handle<v8::Value> *argv = 0;
+
+    invokeCallback(m_callback.newLocal(isolate), 0, argv, executionContext(), isolate);
 }
 
 } // namespace WebCore