Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

39 files changed, 3114 insertions, 2330 deletions

diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
index 34033de62..3ab8d4aed 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
@@ -18,11 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMFloat64Array.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "Float64Array.h"
@@ -32,16 +30,18 @@
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMFloat32Array.h"
 #include "webkit/WebKitDOMFloat32ArrayPrivate.h"
-#include "webkit/WebKitDOMFloat64Array.h"
 #include "webkit/WebKitDOMFloat64ArrayPrivate.h"
 #include "webkit/WebKitDOMInt32Array.h"
 #include "webkit/WebKitDOMInt32ArrayPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMFloat64Array* kit(WebCore::Float64Array* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -51,30 +51,6 @@ WebKitDOMFloat64Array* kit(WebCore::Float64Array* obj)
 
     return static_cast<WebKitDOMFloat64Array*>(DOMObjectCache::put(obj, WebKit::wrapFloat64Array(obj)));
 }
-    
-} // namespace WebKit //
-
-WebKitDOMInt32Array*
-webkit_dom_float64array_foo(WebKitDOMFloat64Array* self, WebKitDOMFloat32Array* array)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::Float64Array * item = WebKit::core(self);
-    g_return_val_if_fail(array, 0);
-    WebCore::Float32Array * converted_array = NULL;
-    if (array != NULL) {
-        converted_array = WebKit::core(array);
-        g_return_val_if_fail(converted_array, 0);
-    }
-    PassRefPtr<WebCore::Int32Array> g_res = WTF::getPtr(item->foo(converted_array));
-    WebKitDOMInt32Array* res = WebKit::kit(g_res.get());
-    return res;
-}
-
-
-G_DEFINE_TYPE(WebKitDOMFloat64Array, webkit_dom_float64array, WEBKIT_TYPE_DOM_ARRAY_BUFFER_VIEW)
-
-namespace WebKit {
 
 WebCore::Float64Array* core(WebKitDOMFloat64Array* request)
 {
@@ -86,45 +62,60 @@ WebCore::Float64Array* core(WebKitDOMFloat64Array* request)
     return coreObject;
 }
 
+WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMFloat64Array, webkit_dom_float64array, WEBKIT_TYPE_DOM_ARRAY_BUFFER_VIEW)
+
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_float64array_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::Float64Array* coreObject = static_cast<WebCore::Float64Array *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::Float64Array* coreObject = static_cast<WebCore::Float64Array*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_float64array_parent_class)->finalize(object);
 }
 
-static void webkit_dom_float64array_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_float64array_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_float64array_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_float64array_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -139,7 +130,7 @@ static void webkit_dom_float64array_constructed(GObject* object)
 
 static void webkit_dom_float64array_class_init(WebKitDOMFloat64ArrayClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_float64array_finalize;
     gobjectClass->set_property = webkit_dom_float64array_set_property;
     gobjectClass->get_property = webkit_dom_float64array_get_property;
@@ -153,18 +144,20 @@ static void webkit_dom_float64array_init(WebKitDOMFloat64Array* request)
 {
 }
 
-namespace WebKit {
-WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array* coreObject)
+WebKitDOMInt32Array*
+webkit_dom_float64array_foo(WebKitDOMFloat64Array* self, WebKitDOMFloat32Array* array)
 {
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
-
-    return  WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY,
-                                               "core-object", coreObject, NULL));
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::Float64Array* item = WebKit::core(self);
+    g_return_val_if_fail(array, 0);
+    WebCore::Float32Array* convertedArray = 0;
+    if (array) {
+        convertedArray = WebKit::core(array);
+        g_return_val_if_fail(convertedArray, 0);
+    }
+    RefPtr<WebCore::Int32Array> gobjectResult = WTF::getPtr(item->foo(convertedArray));
+    WebKitDOMInt32Array* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
-} // namespace WebKit
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
index 0dbc986f7..addbc851d 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMFloat64Array_h
 #define WebKitDOMFloat64Array_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMArrayBufferView.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMArrayBufferView.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_FLOAT64ARRAY            (webkit_dom_float64array_get_type())
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
index b0ec614f2..8fa93b8bf 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H
-#define WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H
+#ifndef WebKitDOMFloat64ArrayPrivate_h
+#define WebKitDOMFloat64ArrayPrivate_h
 
+#include "Float64Array.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMArrayBufferView.h>
-#include "Float64Array.h"
-namespace WebKit {
-    WebKitDOMFloat64Array *
-    wrapFloat64Array(WebCore::Float64Array *coreObject);
-
-    WebCore::Float64Array *
-    core(WebKitDOMFloat64Array *request);
-
-    WebKitDOMFloat64Array*
-    kit(WebCore::Float64Array* node);
 
+namespace WebKit {
+WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array*);
+WebCore::Float64Array* core(WebKitDOMFloat64Array* request);
+WebKitDOMFloat64Array* kit(WebCore::Float64Array* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H */
+#endif /* WebKitDOMFloat64ArrayPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
index c93a92cd9..cd6ade536 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
@@ -18,11 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestActiveDOMObject.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
@@ -31,14 +29,16 @@
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestActiveDOMObject.h"
 #include "webkit/WebKitDOMTestActiveDOMObjectPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -48,49 +48,6 @@ WebKitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject* obj)
 
     return static_cast<WebKitDOMTestActiveDOMObject*>(DOMObjectCache::put(obj, WebKit::wrapTestActiveDOMObject(obj)));
 }
-    
-} // namespace WebKit //
-
-void
-webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* next_child)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
-    g_return_if_fail(next_child);
-    WebCore::Node * converted_next_child = NULL;
-    if (next_child != NULL) {
-        converted_next_child = WebKit::core(next_child);
-        g_return_if_fail(converted_next_child);
-    }
-    item->excitingFunction(converted_next_child);
-}
-
-void
-webkit_dom_test_active_dom_object_post_message(WebKitDOMTestActiveDOMObject* self, const gchar* message)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
-    g_return_if_fail(message);
-    WTF::String converted_message = WTF::String::fromUTF8(message);
-    item->postMessage(converted_message);
-}
-
-glong
-webkit_dom_test_active_dom_object_get_exciting_attr(WebKitDOMTestActiveDOMObject* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
-    glong res = item->excitingAttr();
-    return res;
-}
-
-
-G_DEFINE_TYPE(WebKitDOMTestActiveDOMObject, webkit_dom_test_active_dom_object, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
 
 WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request)
 {
@@ -102,53 +59,67 @@ WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request)
     return coreObject;
 }
 
+WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestActiveDOMObject, webkit_dom_test_active_dom_object, WEBKIT_TYPE_DOM_OBJECT)
+
 enum {
     PROP_0,
     PROP_EXCITING_ATTR,
 };
 
-
 static void webkit_dom_test_active_dom_object_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestActiveDOMObject* coreObject = static_cast<WebCore::TestActiveDOMObject *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestActiveDOMObject* coreObject = static_cast<WebCore::TestActiveDOMObject*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_active_dom_object_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_active_dom_object_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_active_dom_object_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestActiveDOMObject* self = WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(object);
     WebCore::TestActiveDOMObject* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_EXCITING_ATTR:
-    {
+    switch (propertyId) {
+    case PROP_EXCITING_ATTR: {
         g_value_set_long(value, coreSelf->excitingAttr());
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -163,7 +134,7 @@ static void webkit_dom_test_active_dom_object_constructed(GObject* object)
 
 static void webkit_dom_test_active_dom_object_class_init(WebKitDOMTestActiveDOMObjectClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_active_dom_object_finalize;
     gobjectClass->set_property = webkit_dom_test_active_dom_object_set_property;
     gobjectClass->get_property = webkit_dom_test_active_dom_object_get_property;
@@ -186,18 +157,39 @@ static void webkit_dom_test_active_dom_object_init(WebKitDOMTestActiveDOMObject*
 {
 }
 
-namespace WebKit {
-WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject* coreObject)
+void
+webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* nextChild)
 {
-    g_return_val_if_fail(coreObject, 0);
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
+    g_return_if_fail(nextChild);
+    WebCore::Node* convertedNextChild = 0;
+    if (nextChild) {
+        convertedNextChild = WebKit::core(nextChild);
+        g_return_if_fail(convertedNextChild);
+    }
+    item->excitingFunction(convertedNextChild);
+}
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+void
+webkit_dom_test_active_dom_object_post_message(WebKitDOMTestActiveDOMObject* self, const gchar* message)
+{
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
+    g_return_if_fail(message);
+    WTF::String convertedMessage = WTF::String::fromUTF8(message);
+    item->postMessage(convertedMessage);
+}
 
-    return  WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT,
-                                               "core-object", coreObject, NULL));
+glong
+webkit_dom_test_active_dom_object_get_exciting_attr(WebKitDOMTestActiveDOMObject* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
+    glong result = item->excitingAttr();
+    return result;
 }
-} // namespace WebKit
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
index f3cfdb3a9..42594a056 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestActiveDOMObject_h
 #define WebKitDOMTestActiveDOMObject_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT            (webkit_dom_test_active_dom_object_get_type())
@@ -49,13 +48,13 @@ webkit_dom_test_active_dom_object_get_type (void);
 /**
  * webkit_dom_test_active_dom_object_exciting_function:
  * @self: A #WebKitDOMTestActiveDOMObject
- * @next_child: A #WebKitDOMNode
+ * @nextChild: A #WebKitDOMNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* next_child);
+webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* nextChild);
 
 /**
  * webkit_dom_test_active_dom_object_post_message:
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
index f28c7f9d1..547cdaae3 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H
-#define WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H
+#ifndef WebKitDOMTestActiveDOMObjectPrivate_h
+#define WebKitDOMTestActiveDOMObjectPrivate_h
 
+#include "TestActiveDOMObject.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestActiveDOMObject.h"
-namespace WebKit {
-    WebKitDOMTestActiveDOMObject *
-    wrapTestActiveDOMObject(WebCore::TestActiveDOMObject *coreObject);
-
-    WebCore::TestActiveDOMObject *
-    core(WebKitDOMTestActiveDOMObject *request);
-
-    WebKitDOMTestActiveDOMObject*
-    kit(WebCore::TestActiveDOMObject* node);
 
+namespace WebKit {
+WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject*);
+WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request);
+WebKitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H */
+#endif /* WebKitDOMTestActiveDOMObjectPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
index 72412f6f7..5cb21fec5 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
@@ -18,13 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestCallback.h"
 
-#if ENABLE(SQL_DATABASE)
-
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
@@ -37,16 +33,24 @@
 #include "webkit/WebKitDOMClass2Private.h"
 #include "webkit/WebKitDOMClass3.h"
 #include "webkit/WebKitDOMClass3Private.h"
+#include "webkit/WebKitDOMClass8.h"
+#include "webkit/WebKitDOMClass8Private.h"
 #include "webkit/WebKitDOMDOMStringList.h"
 #include "webkit/WebKitDOMDOMStringListPrivate.h"
-#include "webkit/WebKitDOMTestCallback.h"
 #include "webkit/WebKitDOMTestCallbackPrivate.h"
+#include "webkit/WebKitDOMThisClass.h"
+#include "webkit/WebKitDOMThisClassPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+#if ENABLE(SQL_DATABASE)
 
 namespace WebKit {
-    
+
 WebKitDOMTestCallback* kit(WebCore::TestCallback* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -56,139 +60,73 @@ WebKitDOMTestCallback* kit(WebCore::TestCallback* obj)
 
     return static_cast<WebKitDOMTestCallback*>(DOMObjectCache::put(obj, WebKit::wrapTestCallback(obj)));
 }
-    
-} // namespace WebKit //
-
-gboolean
-webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    gboolean res = item->callbackWithNoParam();
-    return res;
-}
 
-gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param)
+WebCore::TestCallback* core(WebKitDOMTestCallback* request)
 {
-    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 = 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;
-}
+    g_return_val_if_fail(request, 0);
 
-gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg)
-{
-    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 = 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;
-}
+    WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
 
-glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param)
-{
-    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 = 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;
+    return coreObject;
 }
 
-gboolean
-webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* list_param)
+WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
 {
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail(list_param, 0);
-    WebCore::DOMStringList * converted_list_param = NULL;
-    if (list_param != NULL) {
-        converted_list_param = WebKit::core(list_param);
-        g_return_val_if_fail(converted_list_param, 0);
-    }
-    gboolean res = item->callbackWithStringList(converted_list_param);
-    return res;
-}
-
+    g_return_val_if_fail(coreObject, 0);
 
-G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_TYPE_DOM_OBJECT)
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
 
-namespace WebKit {
+    return WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK, "core-object", coreObject, NULL));
+}
 
-WebCore::TestCallback* core(WebKitDOMTestCallback* request)
-{
-    g_return_val_if_fail(request, 0);
+} // namespace WebKit
 
-    WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback*>(WEBKIT_DOM_OBJECT(request)->coreObject);
-    g_return_val_if_fail(coreObject, 0);
+#endif // ENABLE(SQL_DATABASE)
 
-    return coreObject;
-}
+G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_TYPE_DOM_OBJECT)
 
-} // namespace WebKit
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_test_callback_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+#if ENABLE(SQL_DATABASE)
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
+#endif // ENABLE(SQL_DATABASE)
 
     G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_callback_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_callback_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_callback_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_callback_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -203,7 +141,7 @@ static void webkit_dom_test_callback_constructed(GObject* object)
 
 static void webkit_dom_test_callback_class_init(WebKitDOMTestCallbackClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_callback_finalize;
     gobjectClass->set_property = webkit_dom_test_callback_set_property;
     gobjectClass->get_property = webkit_dom_test_callback_get_property;
@@ -217,19 +155,146 @@ static void webkit_dom_test_callback_init(WebKitDOMTestCallback* request)
 {
 }
 
-namespace WebKit {
-WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
+gboolean
+webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
 {
-    g_return_val_if_fail(coreObject, 0);
+#if ENABLE(SQL_DATABASE)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestCallback* item = WebKit::core(self);
+    gboolean result = item->callbackWithNoParam();
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
+#endif /* ENABLE(SQL_DATABASE) */
+}
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+gboolean
+webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param)
+{
+#if ENABLE(SQL_DATABASE)
+    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* convertedClass1Param = 0;
+    if (class1Param) {
+        convertedClass1Param = WebKit::core(class1Param);
+        g_return_val_if_fail(convertedClass1Param, 0);
+    }
+    gboolean result = item->callbackWithClass1Param(convertedClass1Param);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
+#endif /* ENABLE(SQL_DATABASE) */
+}
 
-    return  WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK,
-                                               "core-object", coreObject, NULL));
+gboolean
+webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg)
+{
+#if ENABLE(SQL_DATABASE)
+    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(strArg, 0);
+    WebCore::Class2* convertedClass2Param = 0;
+    if (class2Param) {
+        convertedClass2Param = WebKit::core(class2Param);
+        g_return_val_if_fail(convertedClass2Param, 0);
+    }
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    gboolean result = item->callbackWithClass2Param(convertedClass2Param, convertedStrArg);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
+#endif /* ENABLE(SQL_DATABASE) */
 }
-} // namespace WebKit
+
+glong
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param)
+{
+#if ENABLE(SQL_DATABASE)
+    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* convertedClass3Param = 0;
+    if (class3Param) {
+        convertedClass3Param = WebKit::core(class3Param);
+        g_return_val_if_fail(convertedClass3Param, 0);
+    }
+    glong result = item->callbackWithNonBoolReturnType(convertedClass3Param);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<glong>(0);
+#endif /* ENABLE(SQL_DATABASE) */
+}
+
+gboolean
+webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam)
+{
+#if ENABLE(SQL_DATABASE)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(listParam, 0);
+    WebCore::DOMStringList* convertedListParam = 0;
+    if (listParam) {
+        convertedListParam = WebKit::core(listParam);
+        g_return_val_if_fail(convertedListParam, 0);
+    }
+    gboolean result = item->callbackWithStringList(convertedListParam);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
+#endif /* ENABLE(SQL_DATABASE) */
+}
+
+gboolean
+webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam)
+{
+#if ENABLE(SQL_DATABASE)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestCallback* item = WebKit::core(self);
+    gboolean result = item->callbackWithBoolean(boolParam);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
+#endif /* ENABLE(SQL_DATABASE) */
+}
+
+gboolean
+webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, WebKitDOMClass8* class8Param, WebKitDOMThisClass* thisClassParam)
+{
+#if ENABLE(SQL_DATABASE)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(class8Param, 0);
+    g_return_val_if_fail(thisClassParam, 0);
+    WebCore::Class8* convertedClass8Param = 0;
+    if (class8Param) {
+        convertedClass8Param = WebKit::core(class8Param);
+        g_return_val_if_fail(convertedClass8Param, 0);
+    }
+    WebCore::ThisClass* convertedThisClassParam = 0;
+    if (thisClassParam) {
+        convertedThisClassParam = WebKit::core(thisClassParam);
+        g_return_val_if_fail(convertedThisClassParam, 0);
+    }
+    gboolean result = item->callbackRequiresThisToPass(convertedClass8Param, convertedThisClassParam);
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+    return static_cast<gboolean>(0);
 #endif /* ENABLE(SQL_DATABASE) */
+}
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
index 3c01fa22f..9b2e14034 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestCallback_h
 #define WebKitDOMTestCallback_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_CALLBACK            (webkit_dom_test_callback_get_type())
@@ -59,47 +58,70 @@ webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self);
 /**
  * webkit_dom_test_callback_callback_with_class1param:
  * @self: A #WebKitDOMTestCallback
- * @class1param: A #WebKitDOMClass1
+ * @class1Param: A #WebKitDOMClass1
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param);
+webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param);
 
 /**
  * webkit_dom_test_callback_callback_with_class2param:
  * @self: A #WebKitDOMTestCallback
- * @class2param: A #WebKitDOMClass2
- * @str_arg: A #gchar
+ * @class2Param: A #WebKitDOMClass2
+ * @strArg: A #gchar
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg);
+webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg);
 
 /**
  * webkit_dom_test_callback_callback_with_non_bool_return_type:
  * @self: A #WebKitDOMTestCallback
- * @class3param: A #WebKitDOMClass3
+ * @class3Param: A #WebKitDOMClass3
  *
  * Returns:
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param);
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param);
 
 /**
  * webkit_dom_test_callback_callback_with_string_list:
  * @self: A #WebKitDOMTestCallback
- * @list_param: A #WebKitDOMDOMStringList
+ * @listParam: A #WebKitDOMDOMStringList
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API gboolean
+webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam);
+
+/**
+ * webkit_dom_test_callback_callback_with_boolean:
+ * @self: A #WebKitDOMTestCallback
+ * @boolParam: A #gboolean
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API gboolean
+webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam);
+
+/**
+ * webkit_dom_test_callback_callback_requires_this_to_pass:
+ * @self: A #WebKitDOMTestCallback
+ * @class8Param: A #WebKitDOMClass8
+ * @thisClassParam: A #WebKitDOMThisClass
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* list_param);
+webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, WebKitDOMClass8* class8Param, WebKitDOMThisClass* thisClassParam);
 
 G_END_DECLS
 
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
index 3ad6ff444..358da2d76 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
@@ -18,22 +18,20 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H
-#define WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H
+#ifndef WebKitDOMTestCallbackPrivate_h
+#define WebKitDOMTestCallbackPrivate_h
 
+#include "TestCallback.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestCallback.h"
-namespace WebKit {
-    WebKitDOMTestCallback *
-    wrapTestCallback(WebCore::TestCallback *coreObject);
-
-    WebCore::TestCallback *
-    core(WebKitDOMTestCallback *request);
-
-    WebKitDOMTestCallback*
-    kit(WebCore::TestCallback* node);
+#if ENABLE(SQL_DATABASE)
 
+namespace WebKit {
+WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*);
+WebCore::TestCallback* core(WebKitDOMTestCallback* request);
+WebKitDOMTestCallback* kit(WebCore::TestCallback* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H */
+#endif /* ENABLE(SQL_DATABASE) */
+
+#endif /* WebKitDOMTestCallbackPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
index ea648f564..306baea6f 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
@@ -18,25 +18,25 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestCustomNamedGetter.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestCustomNamedGetter.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestCustomNamedGetter.h"
 #include "webkit/WebKitDOMTestCustomNamedGetterPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -46,24 +46,6 @@ WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* obj)
 
     return static_cast<WebKitDOMTestCustomNamedGetter*>(DOMObjectCache::put(obj, WebKit::wrapTestCustomNamedGetter(obj)));
 }
-    
-} // namespace WebKit //
-
-void
-webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGetter* self, const gchar* str)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestCustomNamedGetter * item = WebKit::core(self);
-    g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->anotherFunction(converted_str);
-}
-
-
-G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
 
 WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
 {
@@ -75,45 +57,60 @@ WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
     return coreObject;
 }
 
+WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
+
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -128,7 +125,7 @@ static void webkit_dom_test_custom_named_getter_constructed(GObject* object)
 
 static void webkit_dom_test_custom_named_getter_class_init(WebKitDOMTestCustomNamedGetterClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_custom_named_getter_finalize;
     gobjectClass->set_property = webkit_dom_test_custom_named_getter_set_property;
     gobjectClass->get_property = webkit_dom_test_custom_named_getter_get_property;
@@ -142,18 +139,14 @@ static void webkit_dom_test_custom_named_getter_init(WebKitDOMTestCustomNamedGet
 {
 }
 
-namespace WebKit {
-WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter* coreObject)
+void
+webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGetter* self, const gchar* str)
 {
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
-
-    return  WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER,
-                                               "core-object", coreObject, NULL));
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestCustomNamedGetter* item = WebKit::core(self);
+    g_return_if_fail(str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->anotherFunction(convertedStr);
 }
-} // namespace WebKit
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
index 956a254aa..f016e3fc4 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestCustomNamedGetter_h
 #define WebKitDOMTestCustomNamedGetter_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER            (webkit_dom_test_custom_named_getter_get_type())
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
index fedd14afc..2e882cd8f 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
-#define WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
+#ifndef WebKitDOMTestCustomNamedGetterPrivate_h
+#define WebKitDOMTestCustomNamedGetterPrivate_h
 
+#include "TestCustomNamedGetter.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestCustomNamedGetter.h"
-namespace WebKit {
-    WebKitDOMTestCustomNamedGetter *
-    wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter *coreObject);
-
-    WebCore::TestCustomNamedGetter *
-    core(WebKitDOMTestCustomNamedGetter *request);
-
-    WebKitDOMTestCustomNamedGetter*
-    kit(WebCore::TestCustomNamedGetter* node);
 
+namespace WebKit {
+WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter*);
+WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request);
+WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H */
+#endif /* WebKitDOMTestCustomNamedGetterPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
index 3788f1844..8b3e98000 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
@@ -18,25 +18,25 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestEventConstructor.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestEventConstructor.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestEventConstructor.h"
 #include "webkit/WebKitDOMTestEventConstructorPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestEventConstructor* kit(WebCore::TestEventConstructor* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -46,33 +46,6 @@ WebKitDOMTestEventConstructor* kit(WebCore::TestEventConstructor* obj)
 
     return static_cast<WebKitDOMTestEventConstructor*>(DOMObjectCache::put(obj, WebKit::wrapTestEventConstructor(obj)));
 }
-    
-} // namespace WebKit //
-
-gchar*
-webkit_dom_test_event_constructor_get_attr1(WebKitDOMTestEventConstructor* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestEventConstructor * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->attr1());
-    return res;
-}
-
-gchar*
-webkit_dom_test_event_constructor_get_attr2(WebKitDOMTestEventConstructor* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestEventConstructor * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->attr2());
-    return res;
-}
-
-
-G_DEFINE_TYPE(WebKitDOMTestEventConstructor, webkit_dom_test_event_constructor, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
 
 WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request)
 {
@@ -84,59 +57,72 @@ WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request)
     return coreObject;
 }
 
+WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestEventConstructor, webkit_dom_test_event_constructor, WEBKIT_TYPE_DOM_OBJECT)
+
 enum {
     PROP_0,
     PROP_ATTR1,
     PROP_ATTR2,
 };
 
-
 static void webkit_dom_test_event_constructor_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestEventConstructor* coreObject = static_cast<WebCore::TestEventConstructor *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestEventConstructor* coreObject = static_cast<WebCore::TestEventConstructor*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_event_constructor_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_event_constructor_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_event_constructor_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestEventConstructor* self = WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(object);
     WebCore::TestEventConstructor* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_ATTR1:
-    {
+    switch (propertyId) {
+    case PROP_ATTR1: {
         g_value_take_string(value, convertToUTF8String(coreSelf->attr1()));
         break;
     }
-    case PROP_ATTR2:
-    {
+    case PROP_ATTR2: {
         g_value_take_string(value, convertToUTF8String(coreSelf->attr2()));
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -151,7 +137,7 @@ static void webkit_dom_test_event_constructor_constructed(GObject* object)
 
 static void webkit_dom_test_event_constructor_class_init(WebKitDOMTestEventConstructorClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_event_constructor_finalize;
     gobjectClass->set_property = webkit_dom_test_event_constructor_set_property;
     gobjectClass->get_property = webkit_dom_test_event_constructor_get_property;
@@ -179,18 +165,23 @@ static void webkit_dom_test_event_constructor_init(WebKitDOMTestEventConstructor
 {
 }
 
-namespace WebKit {
-WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor* coreObject)
+gchar*
+webkit_dom_test_event_constructor_get_attr1(WebKitDOMTestEventConstructor* self)
 {
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestEventConstructor* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->attr1());
+    return result;
+}
 
-    return  WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR,
-                                               "core-object", coreObject, NULL));
+gchar*
+webkit_dom_test_event_constructor_get_attr2(WebKitDOMTestEventConstructor* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestEventConstructor* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->attr2());
+    return result;
 }
-} // namespace WebKit
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
index 2f337fb60..c2f4055a1 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestEventConstructor_h
 #define WebKitDOMTestEventConstructor_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR            (webkit_dom_test_event_constructor_get_type())
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
index bc0e85289..e7fc01875 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H
-#define WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H
+#ifndef WebKitDOMTestEventConstructorPrivate_h
+#define WebKitDOMTestEventConstructorPrivate_h
 
+#include "TestEventConstructor.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestEventConstructor.h"
-namespace WebKit {
-    WebKitDOMTestEventConstructor *
-    wrapTestEventConstructor(WebCore::TestEventConstructor *coreObject);
-
-    WebCore::TestEventConstructor *
-    core(WebKitDOMTestEventConstructor *request);
-
-    WebKitDOMTestEventConstructor*
-    kit(WebCore::TestEventConstructor* node);
 
+namespace WebKit {
+WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor*);
+WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request);
+WebKitDOMTestEventConstructor* kit(WebCore::TestEventConstructor* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H */
+#endif /* WebKitDOMTestEventConstructorPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
index c6ad86e43..0233cdf39 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
@@ -18,11 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestEventTarget.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "GObjectEventListener.h"
@@ -37,14 +35,16 @@
 #include "webkit/WebKitDOMEventPrivate.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestEventTarget.h"
 #include "webkit/WebKitDOMTestEventTargetPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestEventTarget* kit(WebCore::TestEventTarget* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -54,8 +54,29 @@ WebKitDOMTestEventTarget* kit(WebCore::TestEventTarget* obj)
 
     return static_cast<WebKitDOMTestEventTarget*>(DOMObjectCache::put(obj, WebKit::wrapTestEventTarget(obj)));
 }
-    
-} // namespace WebKit //
+
+WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request)
+{
+    g_return_val_if_fail(request, 0);
+
+    WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
+
+    return coreObject;
+}
+
+WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, "core-object", coreObject, NULL));
+}
+
+} // namespace WebKit
 
 static void webkit_dom_test_event_target_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)
 {
@@ -89,92 +110,47 @@ static void webkit_dom_event_target_init(WebKitDOMEventTargetIface* iface)
     iface->remove_event_listener = webkit_dom_test_event_target_remove_event_listener;
 }
 
-WebKitDOMNode*
-webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestEventTarget * item = WebKit::core(self);
-    PassRefPtr<WebCore::Node> g_res = WTF::getPtr(item->item(index));
-    WebKitDOMNode* res = WebKit::kit(g_res.get());
-    return res;
-}
-
-gboolean
-webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError **error)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestEventTarget * item = WebKit::core(self);
-    g_return_val_if_fail(evt, 0);
-    WebCore::Event * converted_evt = NULL;
-    if (evt != NULL) {
-        converted_evt = WebKit::core(evt);
-        g_return_val_if_fail(converted_evt, 0);
-    }
-    WebCore::ExceptionCode ec = 0;
-    gboolean res = item->dispatchEvent(converted_evt, ec);
-    if (ec) {
-        WebCore::ExceptionCodeDescription ecdesc(ec);
-        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
-    }
-    return res;
-}
-
-
 G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestEventTarget, webkit_dom_test_event_target, WEBKIT_TYPE_DOM_OBJECT, G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_EVENT_TARGET, webkit_dom_event_target_init))
 
-namespace WebKit {
-
-WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request)
-{
-    g_return_val_if_fail(request, 0);
-
-    WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget*>(WEBKIT_DOM_OBJECT(request)->coreObject);
-    g_return_val_if_fail(coreObject, 0);
-
-    return coreObject;
-}
-
-} // namespace WebKit
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_test_event_target_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_event_target_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_event_target_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_target_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_event_target_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_target_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -189,7 +165,7 @@ static void webkit_dom_test_event_target_constructed(GObject* object)
 
 static void webkit_dom_test_event_target_class_init(WebKitDOMTestEventTargetClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_event_target_finalize;
     gobjectClass->set_property = webkit_dom_test_event_target_set_property;
     gobjectClass->get_property = webkit_dom_test_event_target_get_property;
@@ -203,18 +179,35 @@ static void webkit_dom_test_event_target_init(WebKitDOMTestEventTarget* request)
 {
 }
 
-namespace WebKit {
-WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget* coreObject)
+WebKitDOMNode*
+webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index)
 {
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestEventTarget* item = WebKit::core(self);
+    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(item->item(index));
+    WebKitDOMNode* result = WebKit::kit(gobjectResult.get());
+    return result;
+}
 
-    return  WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET,
-                                               "core-object", coreObject, NULL));
+gboolean
+webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestEventTarget* item = WebKit::core(self);
+    g_return_val_if_fail(evt, 0);
+    WebCore::Event* convertedEvt = 0;
+    if (evt) {
+        convertedEvt = WebKit::core(evt);
+        g_return_val_if_fail(convertedEvt, 0);
+    }
+    WebCore::ExceptionCode ec = 0;
+    gboolean result = item->dispatchEvent(convertedEvt, ec);
+    if (ec) {
+        WebCore::ExceptionCodeDescription ecdesc(ec);
+        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
+    }
+    return result;
 }
-} // namespace WebKit
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
index c10635b57..80f9d5205 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestEventTarget_h
 #define WebKitDOMTestEventTarget_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_EVENT_TARGET            (webkit_dom_test_event_target_get_type())
@@ -67,7 +66,7 @@ webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index);
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError **error);
+webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error);
 
 G_END_DECLS
 
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
index e5616e3df..1cac5f77f 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H
-#define WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H
+#ifndef WebKitDOMTestEventTargetPrivate_h
+#define WebKitDOMTestEventTargetPrivate_h
 
+#include "TestEventTarget.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestEventTarget.h"
-namespace WebKit {
-    WebKitDOMTestEventTarget *
-    wrapTestEventTarget(WebCore::TestEventTarget *coreObject);
-
-    WebCore::TestEventTarget *
-    core(WebKitDOMTestEventTarget *request);
-
-    WebKitDOMTestEventTarget*
-    kit(WebCore::TestEventTarget* node);
 
+namespace WebKit {
+WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget*);
+WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request);
+WebKitDOMTestEventTarget* kit(WebCore::TestEventTarget* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H */
+#endif /* WebKitDOMTestEventTargetPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp
new file mode 100644
index 000000000..74fe6a672
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp
@@ -0,0 +1,165 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+#include "WebKitDOMTestException.h"
+
+#include "DOMObjectCache.h"
+#include "ExceptionCode.h"
+#include "JSMainThreadExecState.h"
+#include "TestException.h"
+#include "WebKitDOMBinding.h"
+#include "gobject/ConvertToUTF8String.h"
+#include "webkit/WebKitDOMTestExceptionPrivate.h"
+#include "webkitdefines.h"
+#include "webkitglobalsprivate.h"
+#include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+namespace WebKit {
+
+WebKitDOMTestException* kit(WebCore::TestException* obj)
+{
+    g_return_val_if_fail(obj, 0);
+
+    if (gpointer ret = DOMObjectCache::get(obj))
+        return static_cast<WebKitDOMTestException*>(ret);
+
+    return static_cast<WebKitDOMTestException*>(DOMObjectCache::put(obj, WebKit::wrapTestException(obj)));
+}
+
+WebCore::TestException* core(WebKitDOMTestException* request)
+{
+    g_return_val_if_fail(request, 0);
+
+    WebCore::TestException* coreObject = static_cast<WebCore::TestException*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
+
+    return coreObject;
+}
+
+WebKitDOMTestException* wrapTestException(WebCore::TestException* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_EXCEPTION(g_object_new(WEBKIT_TYPE_DOM_TEST_EXCEPTION, "core-object", coreObject, NULL));
+}
+
+} // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestException, webkit_dom_test_exception, WEBKIT_TYPE_DOM_OBJECT)
+
+enum {
+    PROP_0,
+    PROP_NAME,
+};
+
+static void webkit_dom_test_exception_finalize(GObject* object)
+{
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
+    
+    if (domObject->coreObject) {
+        WebCore::TestException* coreObject = static_cast<WebCore::TestException*>(domObject->coreObject);
+
+        WebKit::DOMObjectCache::forget(coreObject);
+        coreObject->deref();
+
+        domObject->coreObject = 0;
+    }
+
+
+    G_OBJECT_CLASS(webkit_dom_test_exception_parent_class)->finalize(object);
+}
+
+static void webkit_dom_test_exception_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    switch (propertyId) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_exception_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    WebKitDOMTestException* self = WEBKIT_DOM_TEST_EXCEPTION(object);
+    WebCore::TestException* coreSelf = WebKit::core(self);
+    switch (propertyId) {
+    case PROP_NAME: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->name()));
+        break;
+    }
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_exception_constructed(GObject* object)
+{
+
+    if (G_OBJECT_CLASS(webkit_dom_test_exception_parent_class)->constructed)
+        G_OBJECT_CLASS(webkit_dom_test_exception_parent_class)->constructed(object);
+}
+
+static void webkit_dom_test_exception_class_init(WebKitDOMTestExceptionClass* requestClass)
+{
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
+    gobjectClass->finalize = webkit_dom_test_exception_finalize;
+    gobjectClass->set_property = webkit_dom_test_exception_set_property;
+    gobjectClass->get_property = webkit_dom_test_exception_get_property;
+    gobjectClass->constructed = webkit_dom_test_exception_constructed;
+
+    g_object_class_install_property(gobjectClass,
+                                    PROP_NAME,
+                                    g_param_spec_string("name", /* name */
+                                                           "test_exception_name", /* short description */
+                                                           "read-only  gchar* TestException.name", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READABLE));
+
+
+}
+
+static void webkit_dom_test_exception_init(WebKitDOMTestException* request)
+{
+}
+
+gchar*
+webkit_dom_test_exception_get_name(WebKitDOMTestException* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestException* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->name());
+    return result;
+}
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h
new file mode 100644
index 000000000..1e1aa5ca0
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h
@@ -0,0 +1,60 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WebKitDOMTestException_h
+#define WebKitDOMTestException_h
+
+#include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitdomdefines.h>
+
+G_BEGIN_DECLS
+#define WEBKIT_TYPE_DOM_TEST_EXCEPTION            (webkit_dom_test_exception_get_type())
+#define WEBKIT_DOM_TEST_EXCEPTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EXCEPTION, WebKitDOMTestException))
+#define WEBKIT_DOM_TEST_EXCEPTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_EXCEPTION, WebKitDOMTestExceptionClass)
+#define WEBKIT_DOM_IS_TEST_EXCEPTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_EXCEPTION))
+#define WEBKIT_DOM_IS_TEST_EXCEPTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_EXCEPTION))
+#define WEBKIT_DOM_TEST_EXCEPTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_EXCEPTION, WebKitDOMTestExceptionClass))
+
+struct _WebKitDOMTestException {
+    WebKitDOMObject parent_instance;
+};
+
+struct _WebKitDOMTestExceptionClass {
+    WebKitDOMObjectClass parent_class;
+};
+
+WEBKIT_API GType
+webkit_dom_test_exception_get_type (void);
+
+/**
+ * webkit_dom_test_exception_get_name:
+ * @self: A #WebKitDOMTestException
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API gchar*
+webkit_dom_test_exception_get_name(WebKitDOMTestException* self);
+
+G_END_DECLS
+
+#endif /* WebKitDOMTestException_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h
new file mode 100644
index 000000000..f8e0f3fc3
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h
@@ -0,0 +1,34 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WebKitDOMTestExceptionPrivate_h
+#define WebKitDOMTestExceptionPrivate_h
+
+#include "TestException.h"
+#include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
+
+namespace WebKit {
+WebKitDOMTestException* wrapTestException(WebCore::TestException*);
+WebCore::TestException* core(WebKitDOMTestException* request);
+WebKitDOMTestException* kit(WebCore::TestException* node);
+} // namespace WebKit
+
+#endif /* WebKitDOMTestExceptionPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
index e6b5ac23c..fb4734fc9 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
@@ -18,13 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestInterface.h"
 
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
@@ -36,16 +32,20 @@
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestInterface.h"
 #include "webkit/WebKitDOMTestInterfacePrivate.h"
 #include "webkit/WebKitDOMTestObj.h"
 #include "webkit/WebKitDOMTestObjPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
-    
+
 WebKitDOMTestInterface* kit(WebCore::TestInterface* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -55,228 +55,137 @@ WebKitDOMTestInterface* kit(WebCore::TestInterface* obj)
 
     return static_cast<WebKitDOMTestInterface*>(DOMObjectCache::put(obj, WebKit::wrapTestInterface(obj)));
 }
-    
-} // namespace WebKit //
 
-void
-webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    WebCore::TestSupplemental::supplementalMethod1(item);
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
-
-WebKitDOMTestObj*
-webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error)
+WebCore::TestInterface* core(WebKitDOMTestInterface* request)
 {
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
-    }
-    WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(item, converted_str_arg, converted_obj_arg, ec));
-    if (ec) {
-        WebCore::ExceptionCodeDescription ecdesc(ec);
-        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
-    }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
-#else
-    return NULL;
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
+    g_return_val_if_fail(request, 0);
 
-void
-webkit_dom_test_interface_supplemental_method4(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    WebCore::TestSupplemental::supplementalMethod4(item);
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
+    WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
 
-gchar*
-webkit_dom_test_interface_get_supplemental_str1(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(item));
-    return res;
-#else
-    return NULL;
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+    return coreObject;
 }
 
-gchar*
-webkit_dom_test_interface_get_supplemental_str2(WebKitDOMTestInterface* self)
+WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface* coreObject)
 {
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(item));
-    return res;
-#else
-    return NULL;
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
+    g_return_val_if_fail(coreObject, 0);
 
-void
-webkit_dom_test_interface_set_supplemental_str2(WebKitDOMTestInterface* self, const gchar* value)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    WebCore::TestSupplemental::setSupplementalStr2(item, converted_value);
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
 
-WebKitDOMNode*
-webkit_dom_test_interface_get_supplemental_node(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::Node> g_res = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(item));
-    WebKitDOMNode* res = WebKit::kit(g_res.get());
-    return res;
-#else
-    return NULL;
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+    return WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE, "core-object", coreObject, NULL));
 }
 
-void
-webkit_dom_test_interface_set_supplemental_node(WebKitDOMTestInterface* self, WebKitDOMNode* value)
-{
-#if ENABLE(Condition11) || ENABLE(Condition12)
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    g_return_if_fail(value);
-    WebCore::Node * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
-    }
-    WebCore::TestSupplemental::setSupplementalNode(item, converted_value);
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-}
+} // namespace WebKit
 
+#endif // ENABLE(Condition1) || ENABLE(Condition2)
 
 G_DEFINE_TYPE(WebKitDOMTestInterface, webkit_dom_test_interface, WEBKIT_TYPE_DOM_OBJECT)
 
-namespace WebKit {
-
-WebCore::TestInterface* core(WebKitDOMTestInterface* request)
-{
-    g_return_val_if_fail(request, 0);
-
-    WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface*>(WEBKIT_DOM_OBJECT(request)->coreObject);
-    g_return_val_if_fail(coreObject, 0);
-
-    return coreObject;
-}
-
-} // namespace WebKit
 enum {
     PROP_0,
-#if ENABLE(Condition11) || ENABLE(Condition12)
     PROP_SUPPLEMENTAL_STR1,
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#if ENABLE(Condition11) || ENABLE(Condition12)
     PROP_SUPPLEMENTAL_STR2,
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#if ENABLE(Condition11) || ENABLE(Condition12)
     PROP_SUPPLEMENTAL_NODE,
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 };
 
-
 static void webkit_dom_test_interface_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
+#endif // ENABLE(Condition1) || ENABLE(Condition2)
 
     G_OBJECT_CLASS(webkit_dom_test_interface_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_interface_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
     WebCore::TestInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
+    switch (propertyId) {
+    case PROP_SUPPLEMENTAL_STR2: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR2:
-    {
         WebCore::TestSupplemental::setSupplementalStr2(coreSelf, WTF::String::fromUTF8(g_value_get_string(value)));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_interface_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
     WebCore::TestInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
+    switch (propertyId) {
+    case PROP_SUPPLEMENTAL_STR1: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR1:
-    {
         g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(coreSelf)));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+    case PROP_SUPPLEMENTAL_STR2: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR2:
-    {
         g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(coreSelf)));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+    case PROP_SUPPLEMENTAL_NODE: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_NODE:
-    {
         RefPtr<WebCore::Node> ptr = WebCore::TestSupplemental::supplementalNode(coreSelf);
         g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -291,13 +200,12 @@ static void webkit_dom_test_interface_constructed(GObject* object)
 
 static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_interface_finalize;
     gobjectClass->set_property = webkit_dom_test_interface_set_property;
     gobjectClass->get_property = webkit_dom_test_interface_get_property;
     gobjectClass->constructed = webkit_dom_test_interface_constructed;
 
-#if ENABLE(Condition11) || ENABLE(Condition12)
     g_object_class_install_property(gobjectClass,
                                     PROP_SUPPLEMENTAL_STR1,
                                     g_param_spec_string("supplemental-str1", /* name */
@@ -305,8 +213,6 @@ static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* re
                                                            "read-only  gchar* TestInterface.supplemental-str1", /* longer - could do with some extra doc stuff here */
                                                            "", /* default */
                                                            WEBKIT_PARAM_READABLE));
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#if ENABLE(Condition11) || ENABLE(Condition12)
     g_object_class_install_property(gobjectClass,
                                     PROP_SUPPLEMENTAL_STR2,
                                     g_param_spec_string("supplemental-str2", /* name */
@@ -314,8 +220,6 @@ static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* re
                                                            "read-write  gchar* TestInterface.supplemental-str2", /* longer - could do with some extra doc stuff here */
                                                            "", /* default */
                                                            WEBKIT_PARAM_READWRITE));
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#if ENABLE(Condition11) || ENABLE(Condition12)
     g_object_class_install_property(gobjectClass,
                                     PROP_SUPPLEMENTAL_NODE,
                                     g_param_spec_object("supplemental-node", /* name */
@@ -323,7 +227,6 @@ static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* re
                                                            "read-write  WebKitDOMNode* TestInterface.supplemental-node", /* longer - could do with some extra doc stuff here */
                                                            WEBKIT_TYPE_DOM_NODE, /* gobject type */
                                                            WEBKIT_PARAM_READWRITE));
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 
 
 }
@@ -332,19 +235,190 @@ static void webkit_dom_test_interface_init(WebKitDOMTestInterface* request)
 {
 }
 
-namespace WebKit {
-WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface* coreObject)
+void
+webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self)
 {
-    g_return_val_if_fail(coreObject, 0);
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    WebCore::TestSupplemental::supplementalMethod1(item);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+WebKitDOMTestObj*
+webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
+    }
+    WebCore::ExceptionCode ec = 0;
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(item, convertedStrArg, convertedObjArg, ec));
+    if (ec) {
+        WebCore::ExceptionCodeDescription ecdesc(ec);
+        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
+    }
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+    return 0;
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
 
-    return  WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE,
-                                               "core-object", coreObject, NULL));
+void
+webkit_dom_test_interface_supplemental_method4(WebKitDOMTestInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    WebCore::TestSupplemental::supplementalMethod4(item);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
-} // namespace WebKit
+
+gchar*
+webkit_dom_test_interface_get_supplemental_str1(WebKitDOMTestInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(item));
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+    return 0;
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+gchar*
+webkit_dom_test_interface_get_supplemental_str2(WebKitDOMTestInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(item));
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+    return 0;
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+void
+webkit_dom_test_interface_set_supplemental_str2(WebKitDOMTestInterface* self, const gchar* value)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    g_return_if_fail(value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    WebCore::TestSupplemental::setSupplementalStr2(item, convertedValue);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+WebKitDOMNode*
+webkit_dom_test_interface_get_supplemental_node(WebKitDOMTestInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(item));
+    WebKitDOMNode* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+    return 0;
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+void
+webkit_dom_test_interface_set_supplemental_node(WebKitDOMTestInterface* self, WebKitDOMNode* value)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+#if ENABLE(Condition11) || ENABLE(Condition12)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestInterface* item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::Node* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
+    }
+    WebCore::TestSupplemental::setSupplementalNode(item, convertedValue);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
index 0b688920e..c5461e907 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestInterface_h
 #define WebKitDOMTestInterface_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_INTERFACE            (webkit_dom_test_interface_get_type())
@@ -59,15 +58,15 @@ webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self);
 /**
  * webkit_dom_test_interface_supplemental_method2:
  * @self: A #WebKitDOMTestInterface
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  * @error: #GError
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error);
+webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
 
 /**
  * webkit_dom_test_interface_supplemental_method4:
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
index 0a4e3a207..12a6c77cf 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
@@ -18,22 +18,20 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H
-#define WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H
+#ifndef WebKitDOMTestInterfacePrivate_h
+#define WebKitDOMTestInterfacePrivate_h
 
+#include "TestInterface.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestInterface.h"
-namespace WebKit {
-    WebKitDOMTestInterface *
-    wrapTestInterface(WebCore::TestInterface *coreObject);
-
-    WebCore::TestInterface *
-    core(WebKitDOMTestInterface *request);
-
-    WebKitDOMTestInterface*
-    kit(WebCore::TestInterface* node);
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
+namespace WebKit {
+WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface*);
+WebCore::TestInterface* core(WebKitDOMTestInterface* request);
+WebKitDOMTestInterface* kit(WebCore::TestInterface* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H */
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
+#endif /* WebKitDOMTestInterfacePrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
index 5946ec0c0..b5cbdffb4 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
@@ -18,25 +18,25 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestMediaQueryListListener.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestMediaQueryListListener.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestMediaQueryListListener.h"
 #include "webkit/WebKitDOMTestMediaQueryListListenerPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -46,13 +46,6 @@ WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* ob
 
     return static_cast<WebKitDOMTestMediaQueryListListener*>(DOMObjectCache::put(obj, WebKit::wrapTestMediaQueryListListener(obj)));
 }
-    
-} // namespace WebKit //
-
-
-G_DEFINE_TYPE(WebKitDOMTestMediaQueryListListener, webkit_dom_test_media_query_list_listener, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
 
 WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* request)
 {
@@ -64,45 +57,60 @@ WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* r
     return coreObject;
 }
 
+WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestMediaQueryListListener, webkit_dom_test_media_query_list_listener, WEBKIT_TYPE_DOM_OBJECT)
+
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_test_media_query_list_listener_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestMediaQueryListListener* coreObject = static_cast<WebCore::TestMediaQueryListListener *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestMediaQueryListListener* coreObject = static_cast<WebCore::TestMediaQueryListListener*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_media_query_list_listener_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_media_query_list_listener_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_media_query_list_listener_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_media_query_list_listener_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_media_query_list_listener_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -117,7 +125,7 @@ static void webkit_dom_test_media_query_list_listener_constructed(GObject* objec
 
 static void webkit_dom_test_media_query_list_listener_class_init(WebKitDOMTestMediaQueryListListenerClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_media_query_list_listener_finalize;
     gobjectClass->set_property = webkit_dom_test_media_query_list_listener_set_property;
     gobjectClass->get_property = webkit_dom_test_media_query_list_listener_get_property;
@@ -131,18 +139,3 @@ static void webkit_dom_test_media_query_list_listener_init(WebKitDOMTestMediaQue
 {
 }
 
-namespace WebKit {
-WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener* coreObject)
-{
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
-
-    return  WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER,
-                                               "core-object", coreObject, NULL));
-}
-} // namespace WebKit
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
index 612439b52..90611274f 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestMediaQueryListListener_h
 #define WebKitDOMTestMediaQueryListListener_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER            (webkit_dom_test_media_query_list_listener_get_type())
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
index 5fc652f3e..5562a4faa 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H
-#define WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H
+#ifndef WebKitDOMTestMediaQueryListListenerPrivate_h
+#define WebKitDOMTestMediaQueryListListenerPrivate_h
 
+#include "TestMediaQueryListListener.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestMediaQueryListListener.h"
-namespace WebKit {
-    WebKitDOMTestMediaQueryListListener *
-    wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener *coreObject);
-
-    WebCore::TestMediaQueryListListener *
-    core(WebKitDOMTestMediaQueryListListener *request);
-
-    WebKitDOMTestMediaQueryListListener*
-    kit(WebCore::TestMediaQueryListListener* node);
 
+namespace WebKit {
+WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener*);
+WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* request);
+WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H */
+#endif /* WebKitDOMTestMediaQueryListListenerPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
index 604172979..bba7b73f3 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
@@ -18,25 +18,25 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestNamedConstructor.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestNamedConstructor.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestNamedConstructor.h"
 #include "webkit/WebKitDOMTestNamedConstructorPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -46,13 +46,6 @@ WebKitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor* obj)
 
     return static_cast<WebKitDOMTestNamedConstructor*>(DOMObjectCache::put(obj, WebKit::wrapTestNamedConstructor(obj)));
 }
-    
-} // namespace WebKit //
-
-
-G_DEFINE_TYPE(WebKitDOMTestNamedConstructor, webkit_dom_test_named_constructor, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
 
 WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request)
 {
@@ -64,45 +57,60 @@ WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request)
     return coreObject;
 }
 
+WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, "core-object", coreObject, NULL));
+}
+
 } // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestNamedConstructor, webkit_dom_test_named_constructor, WEBKIT_TYPE_DOM_OBJECT)
+
 enum {
     PROP_0,
 };
 
-
 static void webkit_dom_test_named_constructor_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestNamedConstructor* coreObject = static_cast<WebCore::TestNamedConstructor *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestNamedConstructor* coreObject = static_cast<WebCore::TestNamedConstructor*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
+
     G_OBJECT_CLASS(webkit_dom_test_named_constructor_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_named_constructor_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_named_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_named_constructor_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_named_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -117,7 +125,7 @@ static void webkit_dom_test_named_constructor_constructed(GObject* object)
 
 static void webkit_dom_test_named_constructor_class_init(WebKitDOMTestNamedConstructorClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_named_constructor_finalize;
     gobjectClass->set_property = webkit_dom_test_named_constructor_set_property;
     gobjectClass->get_property = webkit_dom_test_named_constructor_get_property;
@@ -131,18 +139,3 @@ static void webkit_dom_test_named_constructor_init(WebKitDOMTestNamedConstructor
 {
 }
 
-namespace WebKit {
-WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor* coreObject)
-{
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
-
-    return  WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR,
-                                               "core-object", coreObject, NULL));
-}
-} // namespace WebKit
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
index b0f9c278f..cc05bef61 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestNamedConstructor_h
 #define WebKitDOMTestNamedConstructor_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR            (webkit_dom_test_named_constructor_get_type())
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
index b585171c2..dc7344df4 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H
-#define WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H
+#ifndef WebKitDOMTestNamedConstructorPrivate_h
+#define WebKitDOMTestNamedConstructorPrivate_h
 
+#include "TestNamedConstructor.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestNamedConstructor.h"
-namespace WebKit {
-    WebKitDOMTestNamedConstructor *
-    wrapTestNamedConstructor(WebCore::TestNamedConstructor *coreObject);
-
-    WebCore::TestNamedConstructor *
-    core(WebKitDOMTestNamedConstructor *request);
-
-    WebKitDOMTestNamedConstructor*
-    kit(WebCore::TestNamedConstructor* node);
 
+namespace WebKit {
+WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor*);
+WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request);
+WebKitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H */
+#endif /* WebKitDOMTestNamedConstructorPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp
new file mode 100644
index 000000000..d74877381
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp
@@ -0,0 +1,176 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+#include "WebKitDOMTestNode.h"
+
+#include "DOMObjectCache.h"
+#include "ExceptionCode.h"
+#include "GObjectEventListener.h"
+#include "JSMainThreadExecState.h"
+#include "TestNode.h"
+#include "WebKitDOMBinding.h"
+#include "WebKitDOMEventPrivate.h"
+#include "WebKitDOMEventTarget.h"
+#include "gobject/ConvertToUTF8String.h"
+#include "webkit/WebKitDOMTestNodePrivate.h"
+#include "webkitdefines.h"
+#include "webkitglobalsprivate.h"
+#include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+namespace WebKit {
+
+WebKitDOMTestNode* kit(WebCore::TestNode* obj)
+{
+    g_return_val_if_fail(obj, 0);
+
+    if (gpointer ret = DOMObjectCache::get(obj))
+        return static_cast<WebKitDOMTestNode*>(ret);
+
+    return static_cast<WebKitDOMTestNode*>(DOMObjectCache::put(obj, WebKit::wrapTestNode(obj)));
+}
+
+WebCore::TestNode* core(WebKitDOMTestNode* request)
+{
+    g_return_val_if_fail(request, 0);
+
+    WebCore::TestNode* coreObject = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
+
+    return coreObject;
+}
+
+WebKitDOMTestNode* wrapTestNode(WebCore::TestNode* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_NODE(g_object_new(WEBKIT_TYPE_DOM_TEST_NODE, "core-object", coreObject, NULL));
+}
+
+} // namespace WebKit
+
+static void webkit_dom_test_node_dispatch_event(WebKitDOMEventTarget* target, WebKitDOMEvent* event, GError** error)
+{
+    WebCore::Event* coreEvent = WebKit::core(event);
+    WebCore::TestNode* coreTarget = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(target)->coreObject);
+
+    WebCore::ExceptionCode ec = 0;
+    coreTarget->dispatchEvent(coreEvent, ec);
+    if (ec) {
+        WebCore::ExceptionCodeDescription description(ec);
+        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), description.code, description.name);
+    }
+}
+
+static gboolean webkit_dom_test_node_add_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble, gpointer userData)
+{
+    WebCore::TestNode* coreTarget = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(target)->coreObject);
+    return WebCore::GObjectEventListener::addEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble, userData);
+}
+
+static gboolean webkit_dom_test_node_remove_event_listener(WebKitDOMEventTarget* target, const char* eventName, GCallback handler, gboolean bubble)
+{
+    WebCore::TestNode* coreTarget = static_cast<WebCore::TestNode*>(WEBKIT_DOM_OBJECT(target)->coreObject);
+    return WebCore::GObjectEventListener::removeEventListener(G_OBJECT(target), coreTarget, eventName, handler, bubble);
+}
+
+static void webkit_dom_event_target_init(WebKitDOMEventTargetIface* iface)
+{
+    iface->dispatch_event = webkit_dom_test_node_dispatch_event;
+    iface->add_event_listener = webkit_dom_test_node_add_event_listener;
+    iface->remove_event_listener = webkit_dom_test_node_remove_event_listener;
+}
+
+G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestNode, webkit_dom_test_node, WEBKIT_TYPE_DOM_NODE, G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_EVENT_TARGET, webkit_dom_event_target_init))
+
+enum {
+    PROP_0,
+};
+
+static void webkit_dom_test_node_finalize(GObject* object)
+{
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
+    
+    if (domObject->coreObject) {
+        WebCore::TestNode* coreObject = static_cast<WebCore::TestNode*>(domObject->coreObject);
+
+        WebKit::DOMObjectCache::forget(coreObject);
+        coreObject->deref();
+
+        domObject->coreObject = 0;
+    }
+
+
+    G_OBJECT_CLASS(webkit_dom_test_node_parent_class)->finalize(object);
+}
+
+static void webkit_dom_test_node_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    switch (propertyId) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_node_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    switch (propertyId) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_node_constructed(GObject* object)
+{
+
+    if (G_OBJECT_CLASS(webkit_dom_test_node_parent_class)->constructed)
+        G_OBJECT_CLASS(webkit_dom_test_node_parent_class)->constructed(object);
+}
+
+static void webkit_dom_test_node_class_init(WebKitDOMTestNodeClass* requestClass)
+{
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
+    gobjectClass->finalize = webkit_dom_test_node_finalize;
+    gobjectClass->set_property = webkit_dom_test_node_set_property;
+    gobjectClass->get_property = webkit_dom_test_node_get_property;
+    gobjectClass->constructed = webkit_dom_test_node_constructed;
+
+
+
+}
+
+static void webkit_dom_test_node_init(WebKitDOMTestNode* request)
+{
+}
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h
new file mode 100644
index 000000000..552fd8dc7
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h
@@ -0,0 +1,50 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WebKitDOMTestNode_h
+#define WebKitDOMTestNode_h
+
+#include <glib-object.h>
+#include <webkit/WebKitDOMNode.h>
+#include <webkit/webkitdefines.h>
+#include <webkit/webkitdomdefines.h>
+
+G_BEGIN_DECLS
+#define WEBKIT_TYPE_DOM_TEST_NODE            (webkit_dom_test_node_get_type())
+#define WEBKIT_DOM_TEST_NODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_NODE, WebKitDOMTestNode))
+#define WEBKIT_DOM_TEST_NODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_NODE, WebKitDOMTestNodeClass)
+#define WEBKIT_DOM_IS_TEST_NODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_NODE))
+#define WEBKIT_DOM_IS_TEST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_NODE))
+#define WEBKIT_DOM_TEST_NODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_NODE, WebKitDOMTestNodeClass))
+
+struct _WebKitDOMTestNode {
+    WebKitDOMNode parent_instance;
+};
+
+struct _WebKitDOMTestNodeClass {
+    WebKitDOMNodeClass parent_class;
+};
+
+WEBKIT_API GType
+webkit_dom_test_node_get_type (void);
+
+G_END_DECLS
+
+#endif /* WebKitDOMTestNode_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h
new file mode 100644
index 000000000..4b46c94f8
--- /dev/null
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h
@@ -0,0 +1,34 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WebKitDOMTestNodePrivate_h
+#define WebKitDOMTestNodePrivate_h
+
+#include "TestNode.h"
+#include <glib-object.h>
+#include <webkit/WebKitDOMNode.h>
+
+namespace WebKit {
+WebKitDOMTestNode* wrapTestNode(WebCore::TestNode*);
+WebCore::TestNode* core(WebKitDOMTestNode* request);
+WebKitDOMTestNode* kit(WebCore::TestNode* node);
+} // namespace WebKit
+
+#endif /* WebKitDOMTestNodePrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
index 35add3087..ef72eab44 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
@@ -18,11 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestObj.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "Document.h"
 #include "ExceptionCode.h"
@@ -33,17 +31,16 @@
 #include "WebKitDOMBinding.h"
 #include "bool.h"
 #include "gobject/ConvertToUTF8String.h"
+#include "webkit/WebKitDOMDictionary.h"
+#include "webkit/WebKitDOMDictionaryPrivate.h"
 #include "webkit/WebKitDOMDocument.h"
 #include "webkit/WebKitDOMDocumentPrivate.h"
 #include "webkit/WebKitDOMIDBKey.h"
 #include "webkit/WebKitDOMIDBKeyPrivate.h"
-#include "webkit/WebKitDOMOptionsObject.h"
-#include "webkit/WebKitDOMOptionsObjectPrivate.h"
 #include "webkit/WebKitDOMSVGPoint.h"
 #include "webkit/WebKitDOMSVGPointPrivate.h"
 #include "webkit/WebKitDOMSerializedScriptValue.h"
 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
-#include "webkit/WebKitDOMTestObj.h"
 #include "webkit/WebKitDOMTestObjPrivate.h"
 #include "webkit/WebKitDOMa.h"
 #include "webkit/WebKitDOMaPrivate.h"
@@ -60,9 +57,12 @@
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
-    
+
 WebKitDOMTestObj* kit(WebCore::TestObj* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -72,33 +72,847 @@ WebKitDOMTestObj* kit(WebCore::TestObj* obj)
 
     return static_cast<WebKitDOMTestObj*>(DOMObjectCache::put(obj, WebKit::wrapTestObj(obj)));
 }
+
+WebCore::TestObj* core(WebKitDOMTestObj* request)
+{
+    g_return_val_if_fail(request, 0);
+
+    WebCore::TestObj* coreObject = static_cast<WebCore::TestObj*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
+
+    return coreObject;
+}
+
+WebKitDOMTestObj* wrapTestObj(WebCore::TestObj* coreObject)
+{
+    g_return_val_if_fail(coreObject, 0);
+
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
+
+    return WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ, "core-object", coreObject, NULL));
+}
+
+} // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestObj, webkit_dom_test_obj, WEBKIT_TYPE_DOM_OBJECT)
+
+enum {
+    PROP_0,
+    PROP_READ_ONLY_INT_ATTR,
+    PROP_READ_ONLY_STRING_ATTR,
+    PROP_READ_ONLY_TEST_OBJ_ATTR,
+    PROP_SHORT_ATTR,
+    PROP_UNSIGNED_SHORT_ATTR,
+    PROP_INT_ATTR,
+    PROP_LONG_LONG_ATTR,
+    PROP_UNSIGNED_LONG_LONG_ATTR,
+    PROP_STRING_ATTR,
+    PROP_TEST_OBJ_ATTR,
+    PROP_XML_OBJ_ATTR,
+    PROP_CREATE,
+    PROP_REFLECTED_STRING_ATTR,
+    PROP_REFLECTED_INTEGRAL_ATTR,
+    PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR,
+    PROP_REFLECTED_BOOLEAN_ATTR,
+    PROP_REFLECTED_URL_ATTR,
+    PROP_REFLECTED_STRING_ATTR,
+    PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
+    PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
+    PROP_REFLECTED_CUSTOM_URL_ATTR,
+    PROP_ATTR_WITH_GETTER_EXCEPTION,
+    PROP_ATTR_WITH_SETTER_EXCEPTION,
+    PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
+    PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
+    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
+    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
+    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
+    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
+    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE,
+    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES,
+    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE,
+    PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE,
+    PROP_CONDITIONAL_ATTR1,
+    PROP_CONDITIONAL_ATTR2,
+    PROP_CONDITIONAL_ATTR3,
+    PROP_CONTENT_DOCUMENT,
+    PROP_MUTABLE_POINT,
+    PROP_IMMUTABLE_POINT,
+    PROP_STRAWBERRY,
+    PROP_STRICT_FLOAT,
+    PROP_DESCRIPTION,
+    PROP_ID,
+    PROP_HASH,
+};
+
+static void webkit_dom_test_obj_finalize(GObject* object)
+{
+
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-} // namespace WebKit //
+    if (domObject->coreObject) {
+        WebCore::TestObj* coreObject = static_cast<WebCore::TestObj*>(domObject->coreObject);
+
+        WebKit::DOMObjectCache::forget(coreObject);
+        coreObject->deref();
+
+        domObject->coreObject = 0;
+    }
+
+
+    G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->finalize(object);
+}
+
+static void webkit_dom_test_obj_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
+    WebCore::TestObj* coreSelf = WebKit::core(self);
+    switch (propertyId) {
+    case PROP_UNSIGNED_SHORT_ATTR: {
+        coreSelf->setUnsignedShortAttr((g_value_get_uint(value)));
+        break;
+    }
+    case PROP_INT_ATTR: {
+        coreSelf->setIntAttr((g_value_get_long(value)));
+        break;
+    }
+    case PROP_UNSIGNED_LONG_LONG_ATTR: {
+        coreSelf->setUnsignedLongLongAttr((g_value_get_uint64(value)));
+        break;
+    }
+    case PROP_STRING_ATTR: {
+        coreSelf->setStringAttr(WTF::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_CREATE: {
+        coreSelf->setCreate((g_value_get_boolean(value)));
+        break;
+    }
+    case PROP_REFLECTED_STRING_ATTR: {
+        coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_REFLECTED_INTEGRAL_ATTR: {
+        coreSelf->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, (g_value_get_long(value)));
+        break;
+    }
+    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
+        coreSelf->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, (g_value_get_ulong(value)));
+        break;
+    }
+    case PROP_REFLECTED_BOOLEAN_ATTR: {
+        coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
+        break;
+    }
+    case PROP_REFLECTED_URL_ATTR: {
+        coreSelf->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_REFLECTED_STRING_ATTR: {
+        coreSelf->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
+        coreSelf->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, (g_value_get_long(value)));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
+        coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_URL_ATTR: {
+        coreSelf->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_ATTR_WITH_GETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        coreSelf->setAttrWithGetterException((g_value_get_long(value)), ec);
+        break;
+    }
+    case PROP_ATTR_WITH_SETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
+        break;
+    }
+    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        coreSelf->setStringAttrWithGetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
+        break;
+    }
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
+        break;
+    }
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
+        coreSelf->setWithScriptStateAttribute((g_value_get_long(value)));
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR1: {
+#if ENABLE(Condition1)
+        coreSelf->setConditionalAttr1((g_value_get_long(value)));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif /* ENABLE(Condition1) */
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR2: {
+#if ENABLE(Condition1) && ENABLE(Condition2)
+        coreSelf->setConditionalAttr2((g_value_get_long(value)));
+#else
+#if !ENABLE(Condition1)
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif
+#if !ENABLE(Condition2)
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR3: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
+        coreSelf->setConditionalAttr3((g_value_get_long(value)));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+        break;
+    }
+    case PROP_STRICT_FLOAT: {
+        coreSelf->setStrictFloat((g_value_get_float(value)));
+        break;
+    }
+    case PROP_ID: {
+        coreSelf->setId((g_value_get_long(value)));
+        break;
+    }
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_obj_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
+{
+    WebCore::JSMainThreadNullState state;
+    WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
+    WebCore::TestObj* coreSelf = WebKit::core(self);
+    switch (propertyId) {
+    case PROP_READ_ONLY_INT_ATTR: {
+        g_value_set_long(value, coreSelf->readOnlyIntAttr());
+        break;
+    }
+    case PROP_READ_ONLY_STRING_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->readOnlyStringAttr()));
+        break;
+    }
+    case PROP_READ_ONLY_TEST_OBJ_ATTR: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->readOnlyTestObjAttr();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_SHORT_ATTR: {
+        g_value_set_int(value, coreSelf->shortAttr());
+        break;
+    }
+    case PROP_UNSIGNED_SHORT_ATTR: {
+        g_value_set_uint(value, coreSelf->unsignedShortAttr());
+        break;
+    }
+    case PROP_INT_ATTR: {
+        g_value_set_long(value, coreSelf->intAttr());
+        break;
+    }
+    case PROP_LONG_LONG_ATTR: {
+        g_value_set_int64(value, coreSelf->longLongAttr());
+        break;
+    }
+    case PROP_UNSIGNED_LONG_LONG_ATTR: {
+        g_value_set_uint64(value, coreSelf->unsignedLongLongAttr());
+        break;
+    }
+    case PROP_STRING_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttr()));
+        break;
+    }
+    case PROP_TEST_OBJ_ATTR: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->testObjAttr();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_XML_OBJ_ATTR: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->xmlObjAttr();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_CREATE: {
+        g_value_set_boolean(value, coreSelf->isCreate());
+        break;
+    }
+    case PROP_REFLECTED_STRING_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr)));
+        break;
+    }
+    case PROP_REFLECTED_INTEGRAL_ATTR: {
+        g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
+        break;
+    }
+    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
+        g_value_set_ulong(value, coreSelf->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr));
+        break;
+    }
+    case PROP_REFLECTED_BOOLEAN_ATTR: {
+        g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
+        break;
+    }
+    case PROP_REFLECTED_URL_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)));
+        break;
+    }
+    case PROP_REFLECTED_STRING_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr)));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
+        g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
+        g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
+        break;
+    }
+    case PROP_REFLECTED_CUSTOM_URL_ATTR: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)));
+        break;
+    }
+    case PROP_ATTR_WITH_GETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        g_value_set_long(value, coreSelf->attrWithGetterException(ec));
+        break;
+    }
+    case PROP_ATTR_WITH_SETTER_EXCEPTION: {
+        g_value_set_long(value, coreSelf->attrWithSetterException());
+        break;
+    }
+    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
+        WebCore::ExceptionCode ec = 0;
+        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
+        break;
+    }
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
+        g_value_set_long(value, coreSelf->withScriptStateAttribute());
+        break;
+    }
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttribute();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES: {
+        WebCore::ExceptionCode ec = 0;
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptStateAttributeRaises(ec);
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES: {
+        WebCore::ExceptionCode ec = 0;
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttributeRaises(ec);
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttribute();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES: {
+        WebCore::ExceptionCode ec = 0;
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttributeRaises(ec);
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateWithSpacesAttribute();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE: {
+        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptArgumentsAndCallStackAttribute();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR1: {
+#if ENABLE(Condition1)
+        g_value_set_long(value, coreSelf->conditionalAttr1());
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif /* ENABLE(Condition1) */
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR2: {
+#if ENABLE(Condition1) && ENABLE(Condition2)
+        g_value_set_long(value, coreSelf->conditionalAttr2());
+#else
+#if !ENABLE(Condition1)
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif
+#if !ENABLE(Condition2)
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+        break;
+    }
+    case PROP_CONDITIONAL_ATTR3: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
+        g_value_set_long(value, coreSelf->conditionalAttr3());
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+        break;
+    }
+    case PROP_CONTENT_DOCUMENT: {
+        RefPtr<WebCore::Document> ptr = coreSelf->contentDocument();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_MUTABLE_POINT: {
+        RefPtr<WebCore::SVGPoint> ptr = coreSelf->mutablePoint();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_IMMUTABLE_POINT: {
+        RefPtr<WebCore::SVGPoint> ptr = coreSelf->immutablePoint();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+        break;
+    }
+    case PROP_STRAWBERRY: {
+        g_value_set_int(value, coreSelf->blueberry());
+        break;
+    }
+    case PROP_STRICT_FLOAT: {
+        g_value_set_float(value, coreSelf->strictFloat());
+        break;
+    }
+    case PROP_DESCRIPTION: {
+        g_value_set_long(value, coreSelf->description());
+        break;
+    }
+    case PROP_ID: {
+        g_value_set_long(value, coreSelf->id());
+        break;
+    }
+    case PROP_HASH: {
+        g_value_take_string(value, convertToUTF8String(coreSelf->hash()));
+        break;
+    }
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
+        break;
+    }
+}
+
+
+static void webkit_dom_test_obj_constructed(GObject* object)
+{
+
+    if (G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed)
+        G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed(object);
+}
+
+static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
+{
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
+    gobjectClass->finalize = webkit_dom_test_obj_finalize;
+    gobjectClass->set_property = webkit_dom_test_obj_set_property;
+    gobjectClass->get_property = webkit_dom_test_obj_get_property;
+    gobjectClass->constructed = webkit_dom_test_obj_constructed;
+
+    g_object_class_install_property(gobjectClass,
+                                    PROP_READ_ONLY_INT_ATTR,
+                                    g_param_spec_long("read-only-int-attr", /* name */
+                                                           "test_obj_read-only-int-attr", /* short description */
+                                                           "read-only  glong TestObj.read-only-int-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_READ_ONLY_STRING_ATTR,
+                                    g_param_spec_string("read-only-string-attr", /* name */
+                                                           "test_obj_read-only-string-attr", /* short description */
+                                                           "read-only  gchar* TestObj.read-only-string-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_READ_ONLY_TEST_OBJ_ATTR,
+                                    g_param_spec_object("read-only-test-obj-attr", /* name */
+                                                           "test_obj_read-only-test-obj-attr", /* short description */
+                                                           "read-only  WebKitDOMTestObj* TestObj.read-only-test-obj-attr", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_SHORT_ATTR,
+                                    g_param_spec_int("short-attr", /* name */
+                                                           "test_obj_short-attr", /* short description */
+                                                           "read-write  gshort TestObj.short-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MININT, /* min */
+G_MAXINT, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_UNSIGNED_SHORT_ATTR,
+                                    g_param_spec_uint("unsigned-short-attr", /* name */
+                                                           "test_obj_unsigned-short-attr", /* short description */
+                                                           "read-write  gushort TestObj.unsigned-short-attr", /* longer - could do with some extra doc stuff here */
+                                                           0, /* min */
+G_MAXUINT, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_INT_ATTR,
+                                    g_param_spec_long("int-attr", /* name */
+                                                           "test_obj_int-attr", /* short description */
+                                                           "read-write  glong TestObj.int-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_LONG_LONG_ATTR,
+                                    g_param_spec_int64("long-long-attr", /* name */
+                                                           "test_obj_long-long-attr", /* short description */
+                                                           "read-write  gint64 TestObj.long-long-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MININT64, /* min */
+G_MAXINT64, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_UNSIGNED_LONG_LONG_ATTR,
+                                    g_param_spec_uint64("unsigned-long-long-attr", /* name */
+                                                           "test_obj_unsigned-long-long-attr", /* short description */
+                                                           "read-write  guint64 TestObj.unsigned-long-long-attr", /* longer - could do with some extra doc stuff here */
+                                                           0, /* min */
+G_MAXUINT64, /* min */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_STRING_ATTR,
+                                    g_param_spec_string("string-attr", /* name */
+                                                           "test_obj_string-attr", /* short description */
+                                                           "read-write  gchar* TestObj.string-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_TEST_OBJ_ATTR,
+                                    g_param_spec_object("test-obj-attr", /* name */
+                                                           "test_obj_test-obj-attr", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.test-obj-attr", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_XML_OBJ_ATTR,
+                                    g_param_spec_object("xml-obj-attr", /* name */
+                                                           "test_obj_xml-obj-attr", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.xml-obj-attr", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CREATE,
+                                    g_param_spec_boolean("create", /* name */
+                                                           "test_obj_create", /* short description */
+                                                           "read-write  gboolean TestObj.create", /* longer - could do with some extra doc stuff here */
+                                                           FALSE, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_STRING_ATTR,
+                                    g_param_spec_string("reflected-string-attr", /* name */
+                                                           "test_obj_reflected-string-attr", /* short description */
+                                                           "read-write  gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_INTEGRAL_ATTR,
+                                    g_param_spec_long("reflected-integral-attr", /* name */
+                                                           "test_obj_reflected-integral-attr", /* short description */
+                                                           "read-write  glong TestObj.reflected-integral-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR,
+                                    g_param_spec_ulong("reflected-unsigned-integral-attr", /* name */
+                                                           "test_obj_reflected-unsigned-integral-attr", /* short description */
+                                                           "read-write  gulong TestObj.reflected-unsigned-integral-attr", /* longer - could do with some extra doc stuff here */
+                                                           0, /* min */
+G_MAXULONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_BOOLEAN_ATTR,
+                                    g_param_spec_boolean("reflected-boolean-attr", /* name */
+                                                           "test_obj_reflected-boolean-attr", /* short description */
+                                                           "read-write  gboolean TestObj.reflected-boolean-attr", /* longer - could do with some extra doc stuff here */
+                                                           FALSE, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_URL_ATTR,
+                                    g_param_spec_string("reflected-url-attr", /* name */
+                                                           "test_obj_reflected-url-attr", /* short description */
+                                                           "read-write  gchar* TestObj.reflected-url-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_STRING_ATTR,
+                                    g_param_spec_string("reflected-string-attr", /* name */
+                                                           "test_obj_reflected-string-attr", /* short description */
+                                                           "read-write  gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
+                                    g_param_spec_long("reflected-custom-integral-attr", /* name */
+                                                           "test_obj_reflected-custom-integral-attr", /* short description */
+                                                           "read-write  glong TestObj.reflected-custom-integral-attr", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
+                                    g_param_spec_boolean("reflected-custom-boolean-attr", /* name */
+                                                           "test_obj_reflected-custom-boolean-attr", /* short description */
+                                                           "read-write  gboolean TestObj.reflected-custom-boolean-attr", /* longer - could do with some extra doc stuff here */
+                                                           FALSE, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_REFLECTED_CUSTOM_URL_ATTR,
+                                    g_param_spec_string("reflected-custom-url-attr", /* name */
+                                                           "test_obj_reflected-custom-url-attr", /* short description */
+                                                           "read-write  gchar* TestObj.reflected-custom-url-attr", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_ATTR_WITH_GETTER_EXCEPTION,
+                                    g_param_spec_long("attr-with-getter-exception", /* name */
+                                                           "test_obj_attr-with-getter-exception", /* short description */
+                                                           "read-write  glong TestObj.attr-with-getter-exception", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_ATTR_WITH_SETTER_EXCEPTION,
+                                    g_param_spec_long("attr-with-setter-exception", /* name */
+                                                           "test_obj_attr-with-setter-exception", /* short description */
+                                                           "read-write  glong TestObj.attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
+                                    g_param_spec_string("string-attr-with-getter-exception", /* name */
+                                                           "test_obj_string-attr-with-getter-exception", /* short description */
+                                                           "read-write  gchar* TestObj.string-attr-with-getter-exception", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
+                                    g_param_spec_string("string-attr-with-setter-exception", /* name */
+                                                           "test_obj_string-attr-with-setter-exception", /* short description */
+                                                           "read-write  gchar* TestObj.string-attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
+                                    g_param_spec_long("with-script-state-attribute", /* name */
+                                                           "test_obj_with-script-state-attribute", /* short description */
+                                                           "read-write  glong TestObj.with-script-state-attribute", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
+                                    g_param_spec_object("with-script-execution-context-attribute", /* name */
+                                                           "test_obj_with-script-execution-context-attribute", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
+                                    g_param_spec_object("with-script-state-attribute-raises", /* name */
+                                                           "test_obj_with-script-state-attribute-raises", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-state-attribute-raises", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
+                                    g_param_spec_object("with-script-execution-context-attribute-raises", /* name */
+                                                           "test_obj_with-script-execution-context-attribute-raises", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute-raises", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE,
+                                    g_param_spec_object("with-script-execution-context-and-script-state-attribute", /* name */
+                                                           "test_obj_with-script-execution-context-and-script-state-attribute", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-attribute", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES,
+                                    g_param_spec_object("with-script-execution-context-and-script-state-attribute-raises", /* name */
+                                                           "test_obj_with-script-execution-context-and-script-state-attribute-raises", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-attribute-raises", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE,
+                                    g_param_spec_object("with-script-execution-context-and-script-state-with-spaces-attribute", /* name */
+                                                           "test_obj_with-script-execution-context-and-script-state-with-spaces-attribute", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-with-spaces-attribute", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE,
+                                    g_param_spec_object("with-script-arguments-and-call-stack-attribute", /* name */
+                                                           "test_obj_with-script-arguments-and-call-stack-attribute", /* short description */
+                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-arguments-and-call-stack-attribute", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CONDITIONAL_ATTR1,
+                                    g_param_spec_long("conditional-attr1", /* name */
+                                                           "test_obj_conditional-attr1", /* short description */
+                                                           "read-write  glong TestObj.conditional-attr1", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CONDITIONAL_ATTR2,
+                                    g_param_spec_long("conditional-attr2", /* name */
+                                                           "test_obj_conditional-attr2", /* short description */
+                                                           "read-write  glong TestObj.conditional-attr2", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CONDITIONAL_ATTR3,
+                                    g_param_spec_long("conditional-attr3", /* name */
+                                                           "test_obj_conditional-attr3", /* short description */
+                                                           "read-write  glong TestObj.conditional-attr3", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_CONTENT_DOCUMENT,
+                                    g_param_spec_object("content-document", /* name */
+                                                           "test_obj_content-document", /* short description */
+                                                           "read-only  WebKitDOMDocument* TestObj.content-document", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_DOCUMENT, /* gobject type */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_MUTABLE_POINT,
+                                    g_param_spec_object("mutable-point", /* name */
+                                                           "test_obj_mutable-point", /* short description */
+                                                           "read-write  WebKitDOMSVGPoint* TestObj.mutable-point", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_SVG_POINT, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_IMMUTABLE_POINT,
+                                    g_param_spec_object("immutable-point", /* name */
+                                                           "test_obj_immutable-point", /* short description */
+                                                           "read-write  WebKitDOMSVGPoint* TestObj.immutable-point", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_SVG_POINT, /* gobject type */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_STRAWBERRY,
+                                    g_param_spec_int("strawberry", /* name */
+                                                           "test_obj_strawberry", /* short description */
+                                                           "read-write  gint TestObj.strawberry", /* longer - could do with some extra doc stuff here */
+                                                           G_MININT, /* min */
+G_MAXINT, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_STRICT_FLOAT,
+                                    g_param_spec_float("strict-float", /* name */
+                                                           "test_obj_strict-float", /* short description */
+                                                           "read-write  gfloat TestObj.strict-float", /* longer - could do with some extra doc stuff here */
+                                                           -G_MAXFLOAT, /* min */
+G_MAXFLOAT, /* max */
+0.0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_DESCRIPTION,
+                                    g_param_spec_long("description", /* name */
+                                                           "test_obj_description", /* short description */
+                                                           "read-only  glong TestObj.description", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_ID,
+                                    g_param_spec_long("id", /* name */
+                                                           "test_obj_id", /* short description */
+                                                           "read-write  glong TestObj.id", /* longer - could do with some extra doc stuff here */
+                                                           G_MINLONG, /* min */
+G_MAXLONG, /* max */
+0, /* default */
+                                                           WEBKIT_PARAM_READWRITE));
+    g_object_class_install_property(gobjectClass,
+                                    PROP_HASH,
+                                    g_param_spec_string("hash", /* name */
+                                                           "test_obj_hash", /* short description */
+                                                           "read-only  gchar* TestObj.hash", /* longer - could do with some extra doc stuff here */
+                                                           "", /* default */
+                                                           WEBKIT_PARAM_READABLE));
+
+
+}
+
+static void webkit_dom_test_obj_init(WebKitDOMTestObj* request)
+{
+}
 
 void
 webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->voidMethod();
 }
 
 void
-webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail(str_arg);
-    g_return_if_fail(obj_arg);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_if_fail(converted_obj_arg);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_if_fail(strArg);
+    g_return_if_fail(objArg);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_if_fail(convertedObjArg);
     }
-    item->voidMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
+    item->voidMethodWithArgs(intArg, convertedStrArg, convertedObjArg);
 }
 
 glong
@@ -106,27 +920,27 @@ webkit_dom_test_obj_int_method(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->intMethod();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->intMethod();
+    return result;
 }
 
 glong
-webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
-    glong res = item->intMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
-    return res;
+    glong result = item->intMethodWithArgs(intArg, convertedStrArg, convertedObjArg);
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -134,68 +948,68 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethod());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg));
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethodWithArgs(intArg, convertedStrArg, convertedObjArg));
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error)
+webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(converted_str_arg, converted_obj_arg, ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(convertedStrArg, convertedObjArg, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg)
+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail(serialized_arg);
-    WebCore::SerializedScriptValue * converted_serialized_arg = NULL;
-    if (serialized_arg != NULL) {
-        converted_serialized_arg = WebKit::core(serialized_arg);
-        g_return_if_fail(converted_serialized_arg);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_if_fail(serializedArg);
+    WebCore::SerializedScriptValue* convertedSerializedArg = 0;
+    if (serializedArg) {
+        convertedSerializedArg = WebKit::core(serializedArg);
+        g_return_if_fail(convertedSerializedArg);
     }
-    item->serializedValue(converted_serialized_arg);
+    item->serializedValue(convertedSerializedArg);
 }
 
 void
@@ -203,43 +1017,43 @@ webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* key)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(key);
-    WebCore::IDBKey * converted_key = NULL;
-    if (key != NULL) {
-        converted_key = WebKit::core(key);
-        g_return_if_fail(converted_key);
+    WebCore::IDBKey* convertedKey = 0;
+    if (key) {
+        convertedKey = WebKit::core(key);
+        g_return_if_fail(convertedKey);
     }
-    item->idbKey(converted_key);
+    item->idbKey(convertedKey);
 }
 
 void
-webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMOptionsObject* oo, WebKitDOMOptionsObject* ooo)
+webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary* oo, WebKitDOMDictionary* ooo)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(oo);
     g_return_if_fail(ooo);
-    WebCore::OptionsObject * converted_oo = NULL;
-    if (oo != NULL) {
-        converted_oo = WebKit::core(oo);
-        g_return_if_fail(converted_oo);
+    WebCore::Dictionary* convertedOo = 0;
+    if (oo) {
+        convertedOo = WebKit::core(oo);
+        g_return_if_fail(convertedOo);
     }
-    WebCore::OptionsObject * converted_ooo = NULL;
-    if (ooo != NULL) {
-        converted_ooo = WebKit::core(ooo);
-        g_return_if_fail(converted_ooo);
+    WebCore::Dictionary* convertedOoo = 0;
+    if (ooo) {
+        convertedOoo = WebKit::core(ooo);
+        g_return_if_fail(convertedOoo);
     }
-    item->optionsObject(converted_oo, converted_ooo);
+    item->optionsObject(convertedOo, convertedOoo);
 }
 
 void
-webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->methodWithException(ec);
     if (ec) {
@@ -253,7 +1067,7 @@ webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptStateVoid();
 }
 
@@ -262,18 +1076,18 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateObj());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->withScriptStateVoidException(ec);
     if (ec) {
@@ -283,19 +1097,19 @@ webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GEr
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObjException(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateObjException(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -303,7 +1117,7 @@ webkit_dom_test_obj_with_script_execution_context(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptExecutionContext();
 }
 
@@ -312,24 +1126,24 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state(WebKitDOMTest
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptExecutionContextAndScriptState();
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateObjException(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateObjException(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -337,10 +1151,10 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state_with_spaces(W
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpaces());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpaces());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -348,26 +1162,26 @@ webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->methodWithOptionalArg(opt);
 }
 
 void
-webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt)
+webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong nonOpt, glong opt)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    item->methodWithNonOptionalArgAndOptionalArg(non_opt, opt);
+    WebCore::TestObj* item = WebKit::core(self);
+    item->methodWithNonOptionalArgAndOptionalArg(nonOpt, opt);
 }
 
 void
-webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2)
+webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong nonOpt, glong opt1, glong opt2)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    item->methodWithNonOptionalArgAndTwoOptionalArgs(non_opt, opt1, opt2);
+    WebCore::TestObj* item = WebKit::core(self);
+    item->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1, opt2);
 }
 
 void
@@ -375,10 +1189,10 @@ webkit_dom_test_obj_method_with_optional_string(WebKitDOMTestObj* self, const gc
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalString(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalString(convertedStr);
 }
 
 void
@@ -386,10 +1200,10 @@ webkit_dom_test_obj_method_with_optional_string_is_undefined(WebKitDOMTestObj* s
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalStringIsUndefined(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalStringIsUndefined(convertedStr);
 }
 
 void
@@ -397,10 +1211,10 @@ webkit_dom_test_obj_method_with_optional_string_is_null_string(WebKitDOMTestObj*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalStringIsNullString(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalStringIsNullString(convertedStr);
 }
 
 gchar*
@@ -409,11 +1223,12 @@ webkit_dom_test_obj_conditional_method1(WebKitDOMTestObj* self)
 #if ENABLE(Condition1)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->conditionalMethod1());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->conditionalMethod1());
+    return result;
 #else
-    return NULL;
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    return 0;
 #endif /* ENABLE(Condition1) */
 }
 
@@ -423,8 +1238,15 @@ webkit_dom_test_obj_conditional_method2(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->conditionalMethod2();
+#else
+#if !ENABLE(Condition1)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif
+#if !ENABLE(Condition2)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif
 #endif /* ENABLE(Condition1) && ENABLE(Condition2) */
 }
 
@@ -434,8 +1256,11 @@ webkit_dom_test_obj_conditional_method3(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->conditionalMethod3();
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -444,7 +1269,7 @@ webkit_dom_test_obj_class_method(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->classMethod();
 }
 
@@ -453,9 +1278,9 @@ webkit_dom_test_obj_class_method_with_optional(WebKitDOMTestObj* self, glong arg
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->classMethodWithOptional(arg);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->classMethodWithOptional(arg);
+    return result;
 }
 
 void
@@ -464,8 +1289,10 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, glong arg)
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->overloadedMethod1(arg);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
 #endif /* ENABLE(Condition1) */
 }
 
@@ -475,10 +1302,12 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(type);
-    WTF::String converted_type = WTF::String::fromUTF8(type);
-    item->overloadedMethod1(converted_type);
+    WTF::String convertedType = WTF::String::fromUTF8(type);
+    item->overloadedMethod1(convertedType);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
 #endif /* ENABLE(Condition1) */
 }
 
@@ -487,14 +1316,14 @@ webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMa* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::a * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::a* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert1(converted_);
+    item->convert1(converted);
 }
 
 void
@@ -502,14 +1331,14 @@ webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMb* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::b * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::b* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert2(converted_);
+    item->convert2(converted);
 }
 
 void
@@ -517,14 +1346,14 @@ webkit_dom_test_obj_convert3(WebKitDOMTestObj* self, WebKitDOMc* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::c * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::c* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert3(converted_);
+    item->convert3(converted);
 }
 
 void
@@ -532,14 +1361,14 @@ webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMd* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::d * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::d* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert4(converted_);
+    item->convert4(converted);
 }
 
 void
@@ -547,14 +1376,14 @@ webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMe* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::e * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::e* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert5(converted_);
+    item->convert5(converted);
 }
 
 WebKitDOMSVGPoint*
@@ -562,10 +1391,10 @@ webkit_dom_test_obj_mutable_point_function(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->mutablePointFunction());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->mutablePointFunction());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMSVGPoint*
@@ -573,10 +1402,10 @@ webkit_dom_test_obj_immutable_point_function(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->immutablePointFunction());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->immutablePointFunction());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -584,26 +1413,26 @@ webkit_dom_test_obj_orange(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->orange();
 }
 
 WebKitDOMbool*
-webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError **error)
+webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_val_if_fail(str, 0);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::bool> g_res = WTF::getPtr(item->strictFunction(converted_str, a, b, ec));
+    RefPtr<WebCore::bool> gobjectResult = WTF::getPtr(item->strictFunction(convertedStr, a, b, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMbool* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMbool* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 glong
@@ -611,9 +1440,9 @@ webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->readOnlyIntAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->readOnlyIntAttr();
+    return result;
 }
 
 gchar*
@@ -621,9 +1450,9 @@ webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->readOnlyStringAttr());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->readOnlyStringAttr());
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -631,10 +1460,10 @@ webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->readOnlyTestObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 gshort
@@ -642,9 +1471,9 @@ webkit_dom_test_obj_get_short_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gshort res = item->shortAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gshort result = item->shortAttr();
+    return result;
 }
 
 void
@@ -652,7 +1481,7 @@ webkit_dom_test_obj_set_short_attr(WebKitDOMTestObj* self, gshort value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setShortAttr(value);
 }
 
@@ -661,9 +1490,9 @@ webkit_dom_test_obj_get_unsigned_short_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gushort res = item->unsignedShortAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gushort result = item->unsignedShortAttr();
+    return result;
 }
 
 void
@@ -671,7 +1500,7 @@ webkit_dom_test_obj_set_unsigned_short_attr(WebKitDOMTestObj* self, gushort valu
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedShortAttr(value);
 }
 
@@ -680,9 +1509,9 @@ webkit_dom_test_obj_get_int_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->intAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->intAttr();
+    return result;
 }
 
 void
@@ -690,7 +1519,7 @@ webkit_dom_test_obj_set_int_attr(WebKitDOMTestObj* self, glong value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntAttr(value);
 }
 
@@ -699,9 +1528,9 @@ webkit_dom_test_obj_get_long_long_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gint64 res = item->longLongAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gint64 result = item->longLongAttr();
+    return result;
 }
 
 void
@@ -709,7 +1538,7 @@ webkit_dom_test_obj_set_long_long_attr(WebKitDOMTestObj* self, gint64 value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setLongLongAttr(value);
 }
 
@@ -718,9 +1547,9 @@ webkit_dom_test_obj_get_unsigned_long_long_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    guint64 res = item->unsignedLongLongAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    guint64 result = item->unsignedLongLongAttr();
+    return result;
 }
 
 void
@@ -728,7 +1557,7 @@ webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedLongLongAttr(value);
 }
 
@@ -737,9 +1566,9 @@ webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->stringAttr());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->stringAttr());
+    return result;
 }
 
 void
@@ -747,10 +1576,10 @@ webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, const gchar* value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setStringAttr(converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setStringAttr(convertedValue);
 }
 
 WebKitDOMTestObj*
@@ -758,10 +1587,10 @@ webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->testObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -769,14 +1598,14 @@ webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setTestObjAttr(converted_value);
+    item->setTestObjAttr(convertedValue);
 }
 
 WebKitDOMTestObj*
@@ -784,10 +1613,10 @@ webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->xmlObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->xmlObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -795,14 +1624,14 @@ webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* v
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setXMLObjAttr(converted_value);
+    item->setXMLObjAttr(convertedValue);
 }
 
 gboolean
@@ -810,9 +1639,9 @@ webkit_dom_test_obj_get_create(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->isCreate();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->isCreate();
+    return result;
 }
 
 void
@@ -820,7 +1649,7 @@ webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, gboolean value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setCreate(value);
 }
 
@@ -829,9 +1658,9 @@ webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
+    return result;
 }
 
 void
@@ -839,10 +1668,10 @@ webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gcha
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, convertedValue);
 }
 
 glong
@@ -850,9 +1679,9 @@ webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
+    return result;
 }
 
 void
@@ -860,7 +1689,7 @@ webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong va
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, value);
 }
 
@@ -869,9 +1698,9 @@ webkit_dom_test_obj_get_reflected_unsigned_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gulong res = item->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gulong result = item->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr);
+    return result;
 }
 
 void
@@ -879,7 +1708,7 @@ webkit_dom_test_obj_set_reflected_unsigned_integral_attr(WebKitDOMTestObj* self,
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, value);
 }
 
@@ -888,9 +1717,9 @@ webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
+    return result;
 }
 
 void
@@ -898,7 +1727,7 @@ webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value);
 }
 
@@ -907,9 +1736,9 @@ webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
+    return result;
 }
 
 void
@@ -917,10 +1746,10 @@ webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, const gchar*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, convertedValue);
 }
 
 gchar*
@@ -928,9 +1757,9 @@ webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
+    return result;
 }
 
 void
@@ -938,10 +1767,10 @@ webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gcha
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, convertedValue);
 }
 
 glong
@@ -949,9 +1778,9 @@ webkit_dom_test_obj_get_reflected_custom_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
+    return result;
 }
 
 void
@@ -959,7 +1788,7 @@ webkit_dom_test_obj_set_reflected_custom_integral_attr(WebKitDOMTestObj* self, g
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, value);
 }
 
@@ -968,9 +1797,9 @@ webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
+    return result;
 }
 
 void
@@ -978,7 +1807,7 @@ webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gb
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value);
 }
 
@@ -987,9 +1816,9 @@ webkit_dom_test_obj_get_reflected_custom_url_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
+    return result;
 }
 
 void
@@ -997,33 +1826,33 @@ webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, convertedValue);
 }
 
 glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    glong res = item->attrWithGetterException(ec);
+    glong result = item->attrWithGetterException(ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    return res;
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->setAttrWithGetterException(value, ec);
     if (ec) {
@@ -1037,17 +1866,17 @@ webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->attrWithSetterException();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->attrWithSetterException();
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->setAttrWithSetterException(value, ec);
     if (ec) {
@@ -1057,26 +1886,26 @@ webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong
 }
 
 gchar*
-webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    gchar* res = convertToUTF8String(item->stringAttrWithGetterException(ec));
-    return res;
+    gchar* result = convertToUTF8String(item->stringAttrWithGetterException(ec));
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error)
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
     WebCore::ExceptionCode ec = 0;
-    item->setStringAttrWithGetterException(converted_value, ec);
+    item->setStringAttrWithGetterException(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1088,21 +1917,21 @@ webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->stringAttrWithSetterException());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->stringAttrWithSetterException());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error)
+webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
     WebCore::ExceptionCode ec = 0;
-    item->setStringAttrWithSetterException(converted_value, ec);
+    item->setStringAttrWithSetterException(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1114,9 +1943,9 @@ webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->withScriptStateAttribute();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->withScriptStateAttribute();
+    return result;
 }
 
 void
@@ -1124,7 +1953,7 @@ webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glon
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setWithScriptStateAttribute(value);
 }
 
@@ -1133,10 +1962,10 @@ webkit_dom_test_obj_get_with_script_execution_context_attribute(WebKitDOMTestObj
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1144,46 +1973,46 @@ webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAttribute(converted_value);
+    item->setWithScriptExecutionContextAttribute(convertedValue);
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptStateAttributeRaises(converted_value, ec);
+    item->setWithScriptStateAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1191,35 +2020,35 @@ webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* sel
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptExecutionContextAttributeRaises(converted_value, ec);
+    item->setWithScriptExecutionContextAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1231,10 +2060,10 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1242,46 +2071,46 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAndScriptStateAttribute(converted_value);
+    item->setWithScriptExecutionContextAndScriptStateAttribute(convertedValue);
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptExecutionContextAndScriptStateAttributeRaises(converted_value, ec);
+    item->setWithScriptExecutionContextAndScriptStateAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1293,10 +2122,10 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spac
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpacesAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpacesAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1304,14 +2133,14 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_with_spac
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(converted_value);
+    item->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(convertedValue);
 }
 
 glong
@@ -1320,10 +2149,11 @@ webkit_dom_test_obj_get_conditional_attr1(WebKitDOMTestObj* self)
 #if ENABLE(Condition1)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr1();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr1();
+    return result;
 #else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     return static_cast<glong>(0);
 #endif /* ENABLE(Condition1) */
 }
@@ -1334,8 +2164,10 @@ webkit_dom_test_obj_set_conditional_attr1(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr1(value);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
 #endif /* ENABLE(Condition1) */
 }
 
@@ -1345,10 +2177,16 @@ webkit_dom_test_obj_get_conditional_attr2(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr2();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr2();
+    return result;
 #else
+#if !ENABLE(Condition1)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif
+#if !ENABLE(Condition2)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif
     return static_cast<glong>(0);
 #endif /* ENABLE(Condition1) && ENABLE(Condition2) */
 }
@@ -1359,8 +2197,15 @@ webkit_dom_test_obj_set_conditional_attr2(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr2(value);
+#else
+#if !ENABLE(Condition1)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+#endif
+#if !ENABLE(Condition2)
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif
 #endif /* ENABLE(Condition1) && ENABLE(Condition2) */
 }
 
@@ -1370,10 +2215,12 @@ webkit_dom_test_obj_get_conditional_attr3(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr3();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr3();
+    return result;
 #else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
     return static_cast<glong>(0);
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
@@ -1384,8 +2231,11 @@ webkit_dom_test_obj_set_conditional_attr3(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr3(value);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -1394,10 +2244,10 @@ webkit_dom_test_obj_get_content_document(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::Document> g_res = WTF::getPtr(item->contentDocument());
-    WebKitDOMDocument* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::Document> gobjectResult = WTF::getPtr(item->contentDocument());
+    WebKitDOMDocument* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMSVGPoint*
@@ -1405,10 +2255,10 @@ webkit_dom_test_obj_get_mutable_point(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->mutablePoint());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->mutablePoint());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1416,14 +2266,14 @@ webkit_dom_test_obj_set_mutable_point(WebKitDOMTestObj* self, WebKitDOMSVGPoint*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SVGPoint * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SVGPoint* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setMutablePoint(converted_value);
+    item->setMutablePoint(convertedValue);
 }
 
 WebKitDOMSVGPoint*
@@ -1431,10 +2281,10 @@ webkit_dom_test_obj_get_immutable_point(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->immutablePoint());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->immutablePoint());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1442,14 +2292,33 @@ webkit_dom_test_obj_set_immutable_point(WebKitDOMTestObj* self, WebKitDOMSVGPoin
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SVGPoint * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SVGPoint* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setImmutablePoint(converted_value);
+    item->setImmutablePoint(convertedValue);
+}
+
+gint
+webkit_dom_test_obj_get_strawberry(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestObj* item = WebKit::core(self);
+    gint result = item->blueberry();
+    return result;
+}
+
+void
+webkit_dom_test_obj_set_strawberry(WebKitDOMTestObj* self, gint value)
+{
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestObj* item = WebKit::core(self);
+    item->setBlueberry(value);
 }
 
 gfloat
@@ -1457,9 +2326,9 @@ webkit_dom_test_obj_get_strict_float(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gfloat res = item->strictFloat();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gfloat result = item->strictFloat();
+    return result;
 }
 
 void
@@ -1467,7 +2336,7 @@ webkit_dom_test_obj_set_strict_float(WebKitDOMTestObj* self, gfloat value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setStrictFloat(value);
 }
 
@@ -1476,9 +2345,9 @@ webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->description();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->description();
+    return result;
 }
 
 glong
@@ -1486,9 +2355,9 @@ webkit_dom_test_obj_get_id(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->id();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->id();
+    return result;
 }
 
 void
@@ -1496,7 +2365,7 @@ webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setId(value);
 }
 
@@ -1505,870 +2374,8 @@ webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->hash());
-    return res;
-}
-
-
-G_DEFINE_TYPE(WebKitDOMTestObj, webkit_dom_test_obj, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
-
-WebCore::TestObj* core(WebKitDOMTestObj* request)
-{
-    g_return_val_if_fail(request, 0);
-
-    WebCore::TestObj* coreObject = static_cast<WebCore::TestObj*>(WEBKIT_DOM_OBJECT(request)->coreObject);
-    g_return_val_if_fail(coreObject, 0);
-
-    return coreObject;
-}
-
-} // namespace WebKit
-enum {
-    PROP_0,
-    PROP_READ_ONLY_INT_ATTR,
-    PROP_READ_ONLY_STRING_ATTR,
-    PROP_READ_ONLY_TEST_OBJ_ATTR,
-    PROP_SHORT_ATTR,
-    PROP_UNSIGNED_SHORT_ATTR,
-    PROP_INT_ATTR,
-    PROP_LONG_LONG_ATTR,
-    PROP_UNSIGNED_LONG_LONG_ATTR,
-    PROP_STRING_ATTR,
-    PROP_TEST_OBJ_ATTR,
-    PROP_XML_OBJ_ATTR,
-    PROP_CREATE,
-    PROP_REFLECTED_STRING_ATTR,
-    PROP_REFLECTED_INTEGRAL_ATTR,
-    PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR,
-    PROP_REFLECTED_BOOLEAN_ATTR,
-    PROP_REFLECTED_URL_ATTR,
-    PROP_REFLECTED_STRING_ATTR,
-    PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
-    PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
-    PROP_REFLECTED_CUSTOM_URL_ATTR,
-    PROP_ATTR_WITH_GETTER_EXCEPTION,
-    PROP_ATTR_WITH_SETTER_EXCEPTION,
-    PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
-    PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
-    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
-    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
-    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
-    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
-    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE,
-    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES,
-    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE,
-    PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE,
-#if ENABLE(Condition1)
-    PROP_CONDITIONAL_ATTR1,
-#endif /* ENABLE(Condition1) */
-#if ENABLE(Condition1) && ENABLE(Condition2)
-    PROP_CONDITIONAL_ATTR2,
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    PROP_CONDITIONAL_ATTR3,
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    PROP_CONTENT_DOCUMENT,
-    PROP_MUTABLE_POINT,
-    PROP_IMMUTABLE_POINT,
-    PROP_STRICT_FLOAT,
-    PROP_DESCRIPTION,
-    PROP_ID,
-    PROP_HASH,
-};
-
-
-static void webkit_dom_test_obj_finalize(GObject* object)
-{
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
-    
-    if (dom_object->coreObject) {
-        WebCore::TestObj* coreObject = static_cast<WebCore::TestObj *>(dom_object->coreObject);
-
-        WebKit::DOMObjectCache::forget(coreObject);
-        coreObject->deref();
-
-        dom_object->coreObject = NULL;
-    }
-
-    G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->finalize(object);
-}
-
-static void webkit_dom_test_obj_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
-{
-    WebCore::JSMainThreadNullState state;
-    WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
-    WebCore::TestObj* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_UNSIGNED_SHORT_ATTR:
-    {
-        coreSelf->setUnsignedShortAttr((g_value_get_uint(value)));
-        break;
-    }
-    case PROP_INT_ATTR:
-    {
-        coreSelf->setIntAttr((g_value_get_long(value)));
-        break;
-    }
-    case PROP_UNSIGNED_LONG_LONG_ATTR:
-    {
-        coreSelf->setUnsignedLongLongAttr((g_value_get_uint64(value)));
-        break;
-    }
-    case PROP_STRING_ATTR:
-    {
-        coreSelf->setStringAttr(WTF::String::fromUTF8(g_value_get_string(value)));
-        break;
-    }
-    case PROP_CREATE:
-    {
-        coreSelf->setCreate((g_value_get_boolean(value)));
-        break;
-    }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
-        coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
-        break;
-    }
-    case PROP_REFLECTED_INTEGRAL_ATTR:
-    {
-        coreSelf->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, (g_value_get_long(value)));
-        break;
-    }
-    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
-    {
-        coreSelf->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, (g_value_get_ulong(value)));
-        break;
-    }
-    case PROP_REFLECTED_BOOLEAN_ATTR:
-    {
-        coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
-        break;
-    }
-    case PROP_REFLECTED_URL_ATTR:
-    {
-        coreSelf->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
-        break;
-    }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
-        coreSelf->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
-    {
-        coreSelf->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, (g_value_get_long(value)));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
-    {
-        coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_URL_ATTR:
-    {
-        coreSelf->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
-        break;
-    }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        coreSelf->setAttrWithGetterException((g_value_get_long(value)), ec);
-        break;
-    }
-    case PROP_ATTR_WITH_SETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
-        break;
-    }
-    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        coreSelf->setStringAttrWithGetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
-        break;
-    }
-    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
-        break;
-    }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
-    {
-        coreSelf->setWithScriptStateAttribute((g_value_get_long(value)));
-        break;
-    }
-#if ENABLE(Condition1)
-    case PROP_CONDITIONAL_ATTR1:
-    {
-        coreSelf->setConditionalAttr1((g_value_get_long(value)));
-        break;
-    }
-#endif /* ENABLE(Condition1) */
-#if ENABLE(Condition1) && ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR2:
-    {
-        coreSelf->setConditionalAttr2((g_value_get_long(value)));
-        break;
-    }
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR3:
-    {
-        coreSelf->setConditionalAttr3((g_value_get_long(value)));
-        break;
-    }
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    case PROP_STRICT_FLOAT:
-    {
-        coreSelf->setStrictFloat((g_value_get_float(value)));
-        break;
-    }
-    case PROP_ID:
-    {
-        coreSelf->setId((g_value_get_long(value)));
-        break;
-    }
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-        break;
-    }
-}
-
-
-static void webkit_dom_test_obj_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
-{
-    WebCore::JSMainThreadNullState state;
-    WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
-    WebCore::TestObj* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_READ_ONLY_INT_ATTR:
-    {
-        g_value_set_long(value, coreSelf->readOnlyIntAttr());
-        break;
-    }
-    case PROP_READ_ONLY_STRING_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->readOnlyStringAttr()));
-        break;
-    }
-    case PROP_READ_ONLY_TEST_OBJ_ATTR:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->readOnlyTestObjAttr();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_SHORT_ATTR:
-    {
-        g_value_set_int(value, coreSelf->shortAttr());
-        break;
-    }
-    case PROP_UNSIGNED_SHORT_ATTR:
-    {
-        g_value_set_uint(value, coreSelf->unsignedShortAttr());
-        break;
-    }
-    case PROP_INT_ATTR:
-    {
-        g_value_set_long(value, coreSelf->intAttr());
-        break;
-    }
-    case PROP_LONG_LONG_ATTR:
-    {
-        g_value_set_int64(value, coreSelf->longLongAttr());
-        break;
-    }
-    case PROP_UNSIGNED_LONG_LONG_ATTR:
-    {
-        g_value_set_uint64(value, coreSelf->unsignedLongLongAttr());
-        break;
-    }
-    case PROP_STRING_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttr()));
-        break;
-    }
-    case PROP_TEST_OBJ_ATTR:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->testObjAttr();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_XML_OBJ_ATTR:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->xmlObjAttr();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_CREATE:
-    {
-        g_value_set_boolean(value, coreSelf->isCreate());
-        break;
-    }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr)));
-        break;
-    }
-    case PROP_REFLECTED_INTEGRAL_ATTR:
-    {
-        g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
-        break;
-    }
-    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
-    {
-        g_value_set_ulong(value, coreSelf->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr));
-        break;
-    }
-    case PROP_REFLECTED_BOOLEAN_ATTR:
-    {
-        g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
-        break;
-    }
-    case PROP_REFLECTED_URL_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)));
-        break;
-    }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr)));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
-    {
-        g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
-    {
-        g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
-        break;
-    }
-    case PROP_REFLECTED_CUSTOM_URL_ATTR:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)));
-        break;
-    }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        g_value_set_long(value, coreSelf->attrWithGetterException(ec));
-        break;
-    }
-    case PROP_ATTR_WITH_SETTER_EXCEPTION:
-    {
-        g_value_set_long(value, coreSelf->attrWithSetterException());
-        break;
-    }
-    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
-    {
-        WebCore::ExceptionCode ec = 0;
-        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
-        break;
-    }
-    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
-    {
-        g_value_set_long(value, coreSelf->withScriptStateAttribute());
-        break;
-    }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttribute();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES:
-    {
-        WebCore::ExceptionCode ec = 0;
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptStateAttributeRaises(ec);
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES:
-    {
-        WebCore::ExceptionCode ec = 0;
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttributeRaises(ec);
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttribute();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES:
-    {
-        WebCore::ExceptionCode ec = 0;
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttributeRaises(ec);
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateWithSpacesAttribute();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE:
-    {
-        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptArgumentsAndCallStackAttribute();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-#if ENABLE(Condition1)
-    case PROP_CONDITIONAL_ATTR1:
-    {
-        g_value_set_long(value, coreSelf->conditionalAttr1());
-        break;
-    }
-#endif /* ENABLE(Condition1) */
-#if ENABLE(Condition1) && ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR2:
-    {
-        g_value_set_long(value, coreSelf->conditionalAttr2());
-        break;
-    }
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR3:
-    {
-        g_value_set_long(value, coreSelf->conditionalAttr3());
-        break;
-    }
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    case PROP_CONTENT_DOCUMENT:
-    {
-        RefPtr<WebCore::Document> ptr = coreSelf->contentDocument();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_MUTABLE_POINT:
-    {
-        RefPtr<WebCore::SVGPoint> ptr = coreSelf->mutablePoint();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_IMMUTABLE_POINT:
-    {
-        RefPtr<WebCore::SVGPoint> ptr = coreSelf->immutablePoint();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
-    case PROP_STRICT_FLOAT:
-    {
-        g_value_set_float(value, coreSelf->strictFloat());
-        break;
-    }
-    case PROP_DESCRIPTION:
-    {
-        g_value_set_long(value, coreSelf->description());
-        break;
-    }
-    case PROP_ID:
-    {
-        g_value_set_long(value, coreSelf->id());
-        break;
-    }
-    case PROP_HASH:
-    {
-        g_value_take_string(value, convertToUTF8String(coreSelf->hash()));
-        break;
-    }
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-        break;
-    }
-}
-
-
-static void webkit_dom_test_obj_constructed(GObject* object)
-{
-
-    if (G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed)
-        G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->constructed(object);
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->hash());
+    return result;
 }
 
-static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
-{
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
-    gobjectClass->finalize = webkit_dom_test_obj_finalize;
-    gobjectClass->set_property = webkit_dom_test_obj_set_property;
-    gobjectClass->get_property = webkit_dom_test_obj_get_property;
-    gobjectClass->constructed = webkit_dom_test_obj_constructed;
-
-    g_object_class_install_property(gobjectClass,
-                                    PROP_READ_ONLY_INT_ATTR,
-                                    g_param_spec_long("read-only-int-attr", /* name */
-                                                           "test_obj_read-only-int-attr", /* short description */
-                                                           "read-only  glong TestObj.read-only-int-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_READ_ONLY_STRING_ATTR,
-                                    g_param_spec_string("read-only-string-attr", /* name */
-                                                           "test_obj_read-only-string-attr", /* short description */
-                                                           "read-only  gchar* TestObj.read-only-string-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_READ_ONLY_TEST_OBJ_ATTR,
-                                    g_param_spec_object("read-only-test-obj-attr", /* name */
-                                                           "test_obj_read-only-test-obj-attr", /* short description */
-                                                           "read-only  WebKitDOMTestObj* TestObj.read-only-test-obj-attr", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_SHORT_ATTR,
-                                    g_param_spec_int("short-attr", /* name */
-                                                           "test_obj_short-attr", /* short description */
-                                                           "read-write  gshort TestObj.short-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MININT, /* min */
-G_MAXINT, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_UNSIGNED_SHORT_ATTR,
-                                    g_param_spec_uint("unsigned-short-attr", /* name */
-                                                           "test_obj_unsigned-short-attr", /* short description */
-                                                           "read-write  gushort TestObj.unsigned-short-attr", /* longer - could do with some extra doc stuff here */
-                                                           0, /* min */
-G_MAXUINT, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_INT_ATTR,
-                                    g_param_spec_long("int-attr", /* name */
-                                                           "test_obj_int-attr", /* short description */
-                                                           "read-write  glong TestObj.int-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_LONG_LONG_ATTR,
-                                    g_param_spec_int64("long-long-attr", /* name */
-                                                           "test_obj_long-long-attr", /* short description */
-                                                           "read-write  gint64 TestObj.long-long-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MININT64, /* min */
-G_MAXINT64, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_UNSIGNED_LONG_LONG_ATTR,
-                                    g_param_spec_uint64("unsigned-long-long-attr", /* name */
-                                                           "test_obj_unsigned-long-long-attr", /* short description */
-                                                           "read-write  guint64 TestObj.unsigned-long-long-attr", /* longer - could do with some extra doc stuff here */
-                                                           0, /* min */
-G_MAXUINT64, /* min */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_STRING_ATTR,
-                                    g_param_spec_string("string-attr", /* name */
-                                                           "test_obj_string-attr", /* short description */
-                                                           "read-write  gchar* TestObj.string-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_TEST_OBJ_ATTR,
-                                    g_param_spec_object("test-obj-attr", /* name */
-                                                           "test_obj_test-obj-attr", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.test-obj-attr", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_XML_OBJ_ATTR,
-                                    g_param_spec_object("xml-obj-attr", /* name */
-                                                           "test_obj_xml-obj-attr", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.xml-obj-attr", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_CREATE,
-                                    g_param_spec_boolean("create", /* name */
-                                                           "test_obj_create", /* short description */
-                                                           "read-write  gboolean TestObj.create", /* longer - could do with some extra doc stuff here */
-                                                           FALSE, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_STRING_ATTR,
-                                    g_param_spec_string("reflected-string-attr", /* name */
-                                                           "test_obj_reflected-string-attr", /* short description */
-                                                           "read-write  gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_INTEGRAL_ATTR,
-                                    g_param_spec_long("reflected-integral-attr", /* name */
-                                                           "test_obj_reflected-integral-attr", /* short description */
-                                                           "read-write  glong TestObj.reflected-integral-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR,
-                                    g_param_spec_ulong("reflected-unsigned-integral-attr", /* name */
-                                                           "test_obj_reflected-unsigned-integral-attr", /* short description */
-                                                           "read-write  gulong TestObj.reflected-unsigned-integral-attr", /* longer - could do with some extra doc stuff here */
-                                                           0, /* min */
-G_MAXULONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_BOOLEAN_ATTR,
-                                    g_param_spec_boolean("reflected-boolean-attr", /* name */
-                                                           "test_obj_reflected-boolean-attr", /* short description */
-                                                           "read-write  gboolean TestObj.reflected-boolean-attr", /* longer - could do with some extra doc stuff here */
-                                                           FALSE, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_URL_ATTR,
-                                    g_param_spec_string("reflected-url-attr", /* name */
-                                                           "test_obj_reflected-url-attr", /* short description */
-                                                           "read-write  gchar* TestObj.reflected-url-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_STRING_ATTR,
-                                    g_param_spec_string("reflected-string-attr", /* name */
-                                                           "test_obj_reflected-string-attr", /* short description */
-                                                           "read-write  gchar* TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
-                                    g_param_spec_long("reflected-custom-integral-attr", /* name */
-                                                           "test_obj_reflected-custom-integral-attr", /* short description */
-                                                           "read-write  glong TestObj.reflected-custom-integral-attr", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
-                                    g_param_spec_boolean("reflected-custom-boolean-attr", /* name */
-                                                           "test_obj_reflected-custom-boolean-attr", /* short description */
-                                                           "read-write  gboolean TestObj.reflected-custom-boolean-attr", /* longer - could do with some extra doc stuff here */
-                                                           FALSE, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_REFLECTED_CUSTOM_URL_ATTR,
-                                    g_param_spec_string("reflected-custom-url-attr", /* name */
-                                                           "test_obj_reflected-custom-url-attr", /* short description */
-                                                           "read-write  gchar* TestObj.reflected-custom-url-attr", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_ATTR_WITH_GETTER_EXCEPTION,
-                                    g_param_spec_long("attr-with-getter-exception", /* name */
-                                                           "test_obj_attr-with-getter-exception", /* short description */
-                                                           "read-write  glong TestObj.attr-with-getter-exception", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_ATTR_WITH_SETTER_EXCEPTION,
-                                    g_param_spec_long("attr-with-setter-exception", /* name */
-                                                           "test_obj_attr-with-setter-exception", /* short description */
-                                                           "read-write  glong TestObj.attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
-                                    g_param_spec_string("string-attr-with-getter-exception", /* name */
-                                                           "test_obj_string-attr-with-getter-exception", /* short description */
-                                                           "read-write  gchar* TestObj.string-attr-with-getter-exception", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
-                                    g_param_spec_string("string-attr-with-setter-exception", /* name */
-                                                           "test_obj_string-attr-with-setter-exception", /* short description */
-                                                           "read-write  gchar* TestObj.string-attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
-                                    g_param_spec_long("with-script-state-attribute", /* name */
-                                                           "test_obj_with-script-state-attribute", /* short description */
-                                                           "read-write  glong TestObj.with-script-state-attribute", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
-                                    g_param_spec_object("with-script-execution-context-attribute", /* name */
-                                                           "test_obj_with-script-execution-context-attribute", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
-                                    g_param_spec_object("with-script-state-attribute-raises", /* name */
-                                                           "test_obj_with-script-state-attribute-raises", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-state-attribute-raises", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
-                                    g_param_spec_object("with-script-execution-context-attribute-raises", /* name */
-                                                           "test_obj_with-script-execution-context-attribute-raises", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute-raises", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE,
-                                    g_param_spec_object("with-script-execution-context-and-script-state-attribute", /* name */
-                                                           "test_obj_with-script-execution-context-and-script-state-attribute", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-attribute", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES,
-                                    g_param_spec_object("with-script-execution-context-and-script-state-attribute-raises", /* name */
-                                                           "test_obj_with-script-execution-context-and-script-state-attribute-raises", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-attribute-raises", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE,
-                                    g_param_spec_object("with-script-execution-context-and-script-state-with-spaces-attribute", /* name */
-                                                           "test_obj_with-script-execution-context-and-script-state-with-spaces-attribute", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-and-script-state-with-spaces-attribute", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE,
-                                    g_param_spec_object("with-script-arguments-and-call-stack-attribute", /* name */
-                                                           "test_obj_with-script-arguments-and-call-stack-attribute", /* short description */
-                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-arguments-and-call-stack-attribute", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-#if ENABLE(Condition1)
-    g_object_class_install_property(gobjectClass,
-                                    PROP_CONDITIONAL_ATTR1,
-                                    g_param_spec_long("conditional-attr1", /* name */
-                                                           "test_obj_conditional-attr1", /* short description */
-                                                           "read-write  glong TestObj.conditional-attr1", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-#endif /* ENABLE(Condition1) */
-#if ENABLE(Condition1) && ENABLE(Condition2)
-    g_object_class_install_property(gobjectClass,
-                                    PROP_CONDITIONAL_ATTR2,
-                                    g_param_spec_long("conditional-attr2", /* name */
-                                                           "test_obj_conditional-attr2", /* short description */
-                                                           "read-write  glong TestObj.conditional-attr2", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    g_object_class_install_property(gobjectClass,
-                                    PROP_CONDITIONAL_ATTR3,
-                                    g_param_spec_long("conditional-attr3", /* name */
-                                                           "test_obj_conditional-attr3", /* short description */
-                                                           "read-write  glong TestObj.conditional-attr3", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    g_object_class_install_property(gobjectClass,
-                                    PROP_CONTENT_DOCUMENT,
-                                    g_param_spec_object("content-document", /* name */
-                                                           "test_obj_content-document", /* short description */
-                                                           "read-only  WebKitDOMDocument* TestObj.content-document", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_DOCUMENT, /* gobject type */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_MUTABLE_POINT,
-                                    g_param_spec_object("mutable-point", /* name */
-                                                           "test_obj_mutable-point", /* short description */
-                                                           "read-write  WebKitDOMSVGPoint* TestObj.mutable-point", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_SVG_POINT, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_IMMUTABLE_POINT,
-                                    g_param_spec_object("immutable-point", /* name */
-                                                           "test_obj_immutable-point", /* short description */
-                                                           "read-write  WebKitDOMSVGPoint* TestObj.immutable-point", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_SVG_POINT, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_STRICT_FLOAT,
-                                    g_param_spec_float("strict-float", /* name */
-                                                           "test_obj_strict-float", /* short description */
-                                                           "read-write  gfloat TestObj.strict-float", /* longer - could do with some extra doc stuff here */
-                                                           -G_MAXFLOAT, /* min */
-G_MAXFLOAT, /* max */
-0.0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_DESCRIPTION,
-                                    g_param_spec_long("description", /* name */
-                                                           "test_obj_description", /* short description */
-                                                           "read-only  glong TestObj.description", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_ID,
-                                    g_param_spec_long("id", /* name */
-                                                           "test_obj_id", /* short description */
-                                                           "read-write  glong TestObj.id", /* longer - could do with some extra doc stuff here */
-                                                           G_MINLONG, /* min */
-G_MAXLONG, /* max */
-0, /* default */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
-                                    PROP_HASH,
-                                    g_param_spec_string("hash", /* name */
-                                                           "test_obj_hash", /* short description */
-                                                           "read-only  gchar* TestObj.hash", /* longer - could do with some extra doc stuff here */
-                                                           "", /* default */
-                                                           WEBKIT_PARAM_READABLE));
-
-
-}
-
-static void webkit_dom_test_obj_init(WebKitDOMTestObj* request)
-{
-}
-
-namespace WebKit {
-WebKitDOMTestObj* wrapTestObj(WebCore::TestObj* coreObject)
-{
-    g_return_val_if_fail(coreObject, 0);
-
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
-
-    return  WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ,
-                                               "core-object", coreObject, NULL));
-}
-} // namespace WebKit
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
index caeb51ffa..9fa9aadee 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestObj_h
 #define WebKitDOMTestObj_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_OBJ            (webkit_dom_test_obj_get_type())
@@ -59,15 +58,15 @@ webkit_dom_test_obj_void_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_void_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_int_method:
@@ -82,15 +81,15 @@ webkit_dom_test_obj_int_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_int_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns:
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_obj_method:
@@ -105,39 +104,39 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_obj_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_method_that_requires_all_args_and_throws:
  * @self: A #WebKitDOMTestObj
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  * @error: #GError
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error);
+webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
 
 /**
  * webkit_dom_test_obj_serialized_value:
  * @self: A #WebKitDOMTestObj
- * @serialized_arg: A #WebKitDOMSerializedScriptValue
+ * @serializedArg: A #WebKitDOMSerializedScriptValue
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg);
+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg);
 
 /**
  * webkit_dom_test_obj_idb_key:
@@ -153,14 +152,14 @@ webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* key);
 /**
  * webkit_dom_test_obj_options_object:
  * @self: A #WebKitDOMTestObj
- * @oo: A #WebKitDOMOptionsObject
- * @ooo: A #WebKitDOMOptionsObject
+ * @oo: A #WebKitDOMDictionary
+ * @ooo: A #WebKitDOMDictionary
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMOptionsObject* oo, WebKitDOMOptionsObject* ooo);
+webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary* oo, WebKitDOMDictionary* ooo);
 
 /**
  * webkit_dom_test_obj_method_with_exception:
@@ -171,7 +170,7 @@ webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMOptionsObjec
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_state_void:
@@ -202,7 +201,7 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_state_obj_exception:
@@ -213,7 +212,7 @@ webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GEr
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_execution_context:
@@ -244,7 +243,7 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state(WebKitDOMTest
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_execution_context_and_script_state_with_spaces:
@@ -270,19 +269,19 @@ webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt);
 /**
  * webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg:
  * @self: A #WebKitDOMTestObj
- * @non_opt: A #glong
+ * @nonOpt: A #glong
  * @opt: A #glong
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt);
+webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong nonOpt, glong opt);
 
 /**
  * webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args:
  * @self: A #WebKitDOMTestObj
- * @non_opt: A #glong
+ * @nonOpt: A #glong
  * @opt1: A #glong
  * @opt2: A #glong
  *
@@ -290,7 +289,7 @@ webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestO
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2);
+webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong nonOpt, glong opt1, glong opt2);
 
 /**
  * webkit_dom_test_obj_method_with_optional_string:
@@ -495,7 +494,7 @@ webkit_dom_test_obj_orange(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API WebKitDOMbool*
-webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError **error);
+webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError** error);
 
 /**
  * webkit_dom_test_obj_get_read_only_int_attr:
@@ -914,7 +913,7 @@ webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_attr_with_getter_exception:
@@ -926,7 +925,7 @@ webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GErro
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error);
+webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_attr_with_setter_exception:
@@ -948,7 +947,7 @@ webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error);
+webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_string_attr_with_getter_exception:
@@ -959,7 +958,7 @@ webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong
  *
 **/
 WEBKIT_API gchar*
-webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_string_attr_with_getter_exception:
@@ -971,7 +970,7 @@ webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_string_attr_with_setter_exception:
@@ -993,7 +992,7 @@ webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);
+webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_state_attribute:
@@ -1046,7 +1045,7 @@ webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_state_attribute_raises:
@@ -1058,7 +1057,7 @@ webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* sel
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_attribute_raises:
@@ -1069,7 +1068,7 @@ webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* sel
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_execution_context_attribute_raises:
@@ -1081,7 +1080,7 @@ webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOM
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute:
@@ -1113,7 +1112,7 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises:
@@ -1125,7 +1124,7 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spaces_attribute:
@@ -1264,6 +1263,27 @@ WEBKIT_API void
 webkit_dom_test_obj_set_immutable_point(WebKitDOMTestObj* self, WebKitDOMSVGPoint* value);
 
 /**
+ * webkit_dom_test_obj_get_strawberry:
+ * @self: A #WebKitDOMTestObj
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API gint
+webkit_dom_test_obj_get_strawberry(WebKitDOMTestObj* self);
+
+/**
+ * webkit_dom_test_obj_set_strawberry:
+ * @self: A #WebKitDOMTestObj
+ * @value: A #gint
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API void
+webkit_dom_test_obj_set_strawberry(WebKitDOMTestObj* self, gint value);
+
+/**
  * webkit_dom_test_obj_get_strict_float:
  * @self: A #WebKitDOMTestObj
  *
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
index 96722f797..98e4a3149 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
@@ -18,22 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_OBJ_PRIVATE_H
-#define WEB_KIT_DOM_TEST_OBJ_PRIVATE_H
+#ifndef WebKitDOMTestObjPrivate_h
+#define WebKitDOMTestObjPrivate_h
 
+#include "TestObj.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestObj.h"
-namespace WebKit {
-    WebKitDOMTestObj *
-    wrapTestObj(WebCore::TestObj *coreObject);
-
-    WebCore::TestObj *
-    core(WebKitDOMTestObj *request);
-
-    WebKitDOMTestObj*
-    kit(WebCore::TestObj* node);
 
+namespace WebKit {
+WebKitDOMTestObj* wrapTestObj(WebCore::TestObj*);
+WebCore::TestObj* core(WebKitDOMTestObj* request);
+WebKitDOMTestObj* kit(WebCore::TestObj* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_OBJ_PRIVATE_H */
+#endif /* WebKitDOMTestObjPrivate_h */
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
index 961c4b3a5..fe5724e81 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
@@ -18,30 +18,35 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestSerializedScriptValueInterface.h"
 
-#if ENABLE(Condition1) || ENABLE(Condition2)
-
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
+#include "MessagePortArray.h"
 #include "SerializedScriptValue.h"
 #include "TestSerializedScriptValueInterface.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
+#include "webkit/WebKitDOMArray.h"
+#include "webkit/WebKitDOMArrayPrivate.h"
+#include "webkit/WebKitDOMMessagePortArray.h"
+#include "webkit/WebKitDOMMessagePortArrayPrivate.h"
 #include "webkit/WebKitDOMSerializedScriptValue.h"
 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
-#include "webkit/WebKitDOMTestSerializedScriptValueInterface.h"
 #include "webkit/WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
-    
+
 WebKitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptValueInterface* obj)
 {
     g_return_val_if_fail(obj, 0);
@@ -51,167 +56,130 @@ WebKitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptVa
 
     return static_cast<WebKitDOMTestSerializedScriptValueInterface*>(DOMObjectCache::put(obj, WebKit::wrapTestSerializedScriptValueInterface(obj)));
 }
-    
-} // namespace WebKit //
 
-WebKitDOMSerializedScriptValue*
-webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
+WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request)
 {
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->value());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
-}
+    g_return_val_if_fail(request, 0);
 
-void
-webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    g_return_if_fail(value);
-    WebCore::SerializedScriptValue * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
-    }
-    item->setValue(converted_value);
-}
+    WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+    g_return_val_if_fail(coreObject, 0);
 
-WebKitDOMSerializedScriptValue*
-webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->readonlyValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    return coreObject;
 }
 
-WebKitDOMSerializedScriptValue*
-webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
+WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface* coreObject)
 {
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->cachedValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
-}
+    g_return_val_if_fail(coreObject, 0);
 
-void
-webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    g_return_if_fail(value);
-    WebCore::SerializedScriptValue * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
-    }
-    item->setCachedValue(converted_value);
-}
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
+    coreObject->ref();
 
-WebKitDOMSerializedScriptValue*
-webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->cachedReadonlyValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    return WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, "core-object", coreObject, NULL));
 }
 
+} // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestSerializedScriptValueInterface, webkit_dom_test_serialized_script_value_interface, WEBKIT_TYPE_DOM_OBJECT)
-
-namespace WebKit {
-
-WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request)
-{
-    g_return_val_if_fail(request, 0);
-
-    WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface*>(WEBKIT_DOM_OBJECT(request)->coreObject);
-    g_return_val_if_fail(coreObject, 0);
+#endif // ENABLE(Condition1) || ENABLE(Condition2)
 
-    return coreObject;
-}
+G_DEFINE_TYPE(WebKitDOMTestSerializedScriptValueInterface, webkit_dom_test_serialized_script_value_interface, WEBKIT_TYPE_DOM_OBJECT)
 
-} // namespace WebKit
 enum {
     PROP_0,
     PROP_VALUE,
     PROP_READONLY_VALUE,
     PROP_CACHED_VALUE,
+    PROP_PORTS,
     PROP_CACHED_READONLY_VALUE,
 };
 
-
 static void webkit_dom_test_serialized_script_value_interface_finalize(GObject* object)
 {
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
+#endif // ENABLE(Condition1) || ENABLE(Condition2)
 
     G_OBJECT_CLASS(webkit_dom_test_serialized_script_value_interface_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_serialized_script_value_interface_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_serialized_script_value_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestSerializedScriptValueInterface* self = WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(object);
     WebCore::TestSerializedScriptValueInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_VALUE:
-    {
+    switch (propertyId) {
+    case PROP_VALUE: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->value();
         g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-    case PROP_READONLY_VALUE:
-    {
+    case PROP_READONLY_VALUE: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->readonlyValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-    case PROP_CACHED_VALUE:
-    {
+    case PROP_CACHED_VALUE: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
-    case PROP_CACHED_READONLY_VALUE:
-    {
+    case PROP_PORTS: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
+        RefPtr<WebCore::MessagePortArray> ptr = coreSelf->ports();
+        g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+        break;
+    }
+    case PROP_CACHED_READONLY_VALUE: {
+#if ENABLE(Condition1) || ENABLE(Condition2)
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedReadonlyValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
+#else
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -226,7 +194,7 @@ static void webkit_dom_test_serialized_script_value_interface_constructed(GObjec
 
 static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitDOMTestSerializedScriptValueInterfaceClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_serialized_script_value_interface_finalize;
     gobjectClass->set_property = webkit_dom_test_serialized_script_value_interface_set_property;
     gobjectClass->get_property = webkit_dom_test_serialized_script_value_interface_get_property;
@@ -254,6 +222,13 @@ static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitD
                                                            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE, /* gobject type */
                                                            WEBKIT_PARAM_READWRITE));
     g_object_class_install_property(gobjectClass,
+                                    PROP_PORTS,
+                                    g_param_spec_object("ports", /* name */
+                                                           "test_serialized_script_value_interface_ports", /* short description */
+                                                           "read-only  WebKitDOMMessagePortArray* TestSerializedScriptValueInterface.ports", /* longer - could do with some extra doc stuff here */
+                                                           WEBKIT_TYPE_DOM_MESSAGE_PORT_ARRAY, /* gobject type */
+                                                           WEBKIT_PARAM_READABLE));
+    g_object_class_install_property(gobjectClass,
                                     PROP_CACHED_READONLY_VALUE,
                                     g_param_spec_object("cached-readonly-value", /* name */
                                                            "test_serialized_script_value_interface_cached-readonly-value", /* short description */
@@ -268,19 +243,192 @@ static void webkit_dom_test_serialized_script_value_interface_init(WebKitDOMTest
 {
 }
 
-namespace WebKit {
-WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface* coreObject)
+void
+webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList)
 {
-    g_return_val_if_fail(coreObject, 0);
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    g_return_if_fail(data);
+    g_return_if_fail(transferList);
+    WebCore::SerializedScriptValue* convertedData = 0;
+    if (data) {
+        convertedData = WebKit::core(data);
+        g_return_if_fail(convertedData);
+    }
+    WebCore::Array* convertedTransferList = 0;
+    if (transferList) {
+        convertedTransferList = WebKit::core(transferList);
+        g_return_if_fail(convertedTransferList);
+    }
+    item->acceptTransferList(convertedData, convertedTransferList);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
-    coreObject->ref();
+void
+webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    g_return_if_fail(first);
+    g_return_if_fail(tx);
+    g_return_if_fail(second);
+    g_return_if_fail(txx);
+    WebCore::SerializedScriptValue* convertedFirst = 0;
+    if (first) {
+        convertedFirst = WebKit::core(first);
+        g_return_if_fail(convertedFirst);
+    }
+    WebCore::Array* convertedTx = 0;
+    if (tx) {
+        convertedTx = WebKit::core(tx);
+        g_return_if_fail(convertedTx);
+    }
+    WebCore::SerializedScriptValue* convertedSecond = 0;
+    if (second) {
+        convertedSecond = WebKit::core(second);
+        g_return_if_fail(convertedSecond);
+    }
+    WebCore::Array* convertedTxx = 0;
+    if (txx) {
+        convertedTxx = WebKit::core(txx);
+        g_return_if_fail(convertedTxx);
+    }
+    item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
 
-    return  WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE,
-                                               "core-object", coreObject, NULL));
+WebKitDOMSerializedScriptValue*
+webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->value());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
-} // namespace WebKit
+
+void
+webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::SerializedScriptValue* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
+    }
+    item->setValue(convertedValue);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+WebKitDOMSerializedScriptValue*
+webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->readonlyValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+WebKitDOMSerializedScriptValue*
+webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+void
+webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_if_fail(self);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::SerializedScriptValue* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
+    }
+    item->setCachedValue(convertedValue);
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+WebKitDOMMessagePortArray*
+webkit_dom_test_serialized_script_value_interface_get_ports(WebKitDOMTestSerializedScriptValueInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::MessagePortArray> gobjectResult = WTF::getPtr(item->ports());
+    WebKitDOMMessagePortArray* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
+WebKitDOMSerializedScriptValue*
+webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
+{
+#if ENABLE(Condition1) || ENABLE(Condition2)
+    g_return_val_if_fail(self, 0);
+    WebCore::JSMainThreadNullState state;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedReadonlyValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
+#else
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+    return 0;
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
index 516141859..7232fe3e7 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
@@ -21,11 +21,10 @@
 #ifndef WebKitDOMTestSerializedScriptValueInterface_h
 #define WebKitDOMTestSerializedScriptValueInterface_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE            (webkit_dom_test_serialized_script_value_interface_get_type())
@@ -47,6 +46,32 @@ WEBKIT_API GType
 webkit_dom_test_serialized_script_value_interface_get_type (void);
 
 /**
+ * webkit_dom_test_serialized_script_value_interface_accept_transfer_list:
+ * @self: A #WebKitDOMTestSerializedScriptValueInterface
+ * @data: A #WebKitDOMSerializedScriptValue
+ * @transferList: A #WebKitDOMArray
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API void
+webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList);
+
+/**
+ * webkit_dom_test_serialized_script_value_interface_multi_transfer_list:
+ * @self: A #WebKitDOMTestSerializedScriptValueInterface
+ * @first: A #WebKitDOMSerializedScriptValue
+ * @tx: A #WebKitDOMArray
+ * @second: A #WebKitDOMSerializedScriptValue
+ * @txx: A #WebKitDOMArray
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API void
+webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* first, WebKitDOMArray* tx, WebKitDOMSerializedScriptValue* second, WebKitDOMArray* txx);
+
+/**
  * webkit_dom_test_serialized_script_value_interface_get_value:
  * @self: A #WebKitDOMTestSerializedScriptValueInterface
  *
@@ -99,6 +124,16 @@ WEBKIT_API void
 webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
 
 /**
+ * webkit_dom_test_serialized_script_value_interface_get_ports:
+ * @self: A #WebKitDOMTestSerializedScriptValueInterface
+ *
+ * Returns: (transfer none):
+ *
+**/
+WEBKIT_API WebKitDOMMessagePortArray*
+webkit_dom_test_serialized_script_value_interface_get_ports(WebKitDOMTestSerializedScriptValueInterface* self);
+
+/**
  * webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value:
  * @self: A #WebKitDOMTestSerializedScriptValueInterface
  *
diff --git a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h
index 82e79a26f..fcbea0761 100644
--- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h
+++ b/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h
@@ -18,22 +18,20 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H
-#define WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H
+#ifndef WebKitDOMTestSerializedScriptValueInterfacePrivate_h
+#define WebKitDOMTestSerializedScriptValueInterfacePrivate_h
 
+#include "TestSerializedScriptValueInterface.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestSerializedScriptValueInterface.h"
-namespace WebKit {
-    WebKitDOMTestSerializedScriptValueInterface *
-    wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface *coreObject);
-
-    WebCore::TestSerializedScriptValueInterface *
-    core(WebKitDOMTestSerializedScriptValueInterface *request);
-
-    WebKitDOMTestSerializedScriptValueInterface*
-    kit(WebCore::TestSerializedScriptValueInterface* node);
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
+namespace WebKit {
+WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface*);
+WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request);
+WebKitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptValueInterface* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H */
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
+#endif /* WebKitDOMTestSerializedScriptValueInterfacePrivate_h */