Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 20 insertions, 17 deletions

diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
index a67b6ac..94f4ca5 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "config.h"
 
+#if ENABLE(DATABASE)
+
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 #include "ExceptionCode.h"
@@ -55,38 +57,38 @@ gpointer kit(WebCore::TestCallback* obj)
 gboolean
 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1*  class1param)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class1param, 0);
-    WebCore::Class1 * _g_class1param = WebKit::core(class1param);
-    g_return_val_if_fail (_g_class1param, 0);
-    gboolean res = item->callbackWithClass1Param(_g_class1param);
+    g_return_val_if_fail(class1param, 0);
+    WebCore::Class1 * converted_class1param = WebKit::core(class1param);
+    g_return_val_if_fail(converted_class1param, 0);
+    gboolean res = item->callbackWithClass1Param(converted_class1param);
     return res;
 }
 
 gboolean
 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2*  class2param, gchar*  str_arg)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class2param, 0);
-    g_return_val_if_fail (str_arg, 0);
-    WebCore::Class2 * _g_class2param = WebKit::core(class2param);
-    g_return_val_if_fail (_g_class2param, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    gboolean res = item->callbackWithClass2Param(_g_class2param, _g_str_arg);
+    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::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    gboolean res = item->callbackWithClass2Param(converted_class2param, converted_str_arg);
     return res;
 }
 
 glong
 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3*  class3param)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class3param, 0);
-    WebCore::Class3 * _g_class3param = WebKit::core(class3param);
-    g_return_val_if_fail (_g_class3param, 0);
-    glong res = item->callbackWithNonBoolReturnType(_g_class3param);
+    g_return_val_if_fail(class3param, 0);
+    WebCore::Class3 * converted_class3param = WebKit::core(class3param);
+    g_return_val_if_fail(converted_class3param, 0);
+    glong res = item->callbackWithNonBoolReturnType(converted_class3param);
     return res;
 }
 
@@ -182,3 +184,4 @@ WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
     return wrapper;
 }
 } // namespace WebKit
+#endif /* ENABLE(DATABASE) */