Merge WebKit at r73109: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / bindings / scripts / test / GObject / WebKitDOMTestCallback.cpp

diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
index e547d35..554cc15 100644 (file)
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
@@ -25,6 +25,7 @@
 
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
+#include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestCallback.h"
@@ -58,12 +59,15 @@ gpointer kit(WebCore::TestCallback* obj)
 gboolean
 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param)
 {
-    WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
     WebCore::TestCallback * item = WebKit::core(self);
     g_return_val_if_fail(class1param, 0);
-    WebCore::Class1 * converted_class1param = WebKit::core(class1param);
-    g_return_val_if_fail(converted_class1param, 0);
+    WebCore::Class1 * converted_class1param = NULL;
+    if (class1param != NULL) {
+        converted_class1param = WebKit::core(class1param);
+        g_return_val_if_fail(converted_class1param, 0);
+    }
     gboolean res = item->callbackWithClass1Param(converted_class1param);
     return res;
 }
@@ -71,13 +75,16 @@ webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self,
 gboolean
 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg)
 {
-    WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
     WebCore::TestCallback * item = WebKit::core(self);
     g_return_val_if_fail(class2param, 0);
     g_return_val_if_fail(str_arg, 0);
-    WebCore::Class2 * converted_class2param = WebKit::core(class2param);
-    g_return_val_if_fail(converted_class2param, 0);
+    WebCore::Class2 * converted_class2param = NULL;
+    if (class2param != NULL) {
+        converted_class2param = WebKit::core(class2param);
+        g_return_val_if_fail(converted_class2param, 0);
+    }
     WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
     gboolean res = item->callbackWithClass2Param(converted_class2param, converted_str_arg);
     return res;
@@ -86,12 +93,15 @@ webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self,
 glong
 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param)
 {
-    WebCore::JSMainThreadNullState state;
     g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
     WebCore::TestCallback * item = WebKit::core(self);
     g_return_val_if_fail(class3param, 0);
-    WebCore::Class3 * converted_class3param = WebKit::core(class3param);
-    g_return_val_if_fail(converted_class3param, 0);
+    WebCore::Class3 * converted_class3param = NULL;
+    if (class3param != NULL) {
+        converted_class3param = WebKit::core(class3param);
+        g_return_val_if_fail(converted_class3param, 0);
+    }
     glong res = item->callbackWithNonBoolReturnType(converted_class3param);
     return res;
 }