Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

4 files changed, 723 insertions, 140 deletions

diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
index a67b6ac..94f4ca5 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "config.h"
 
+#if ENABLE(DATABASE)
+
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 #include "ExceptionCode.h"
@@ -55,38 +57,38 @@ gpointer kit(WebCore::TestCallback* obj)
 gboolean
 webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1*  class1param)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class1param, 0);
-    WebCore::Class1 * _g_class1param = WebKit::core(class1param);
-    g_return_val_if_fail (_g_class1param, 0);
-    gboolean res = item->callbackWithClass1Param(_g_class1param);
+    g_return_val_if_fail(class1param, 0);
+    WebCore::Class1 * converted_class1param = WebKit::core(class1param);
+    g_return_val_if_fail(converted_class1param, 0);
+    gboolean res = item->callbackWithClass1Param(converted_class1param);
     return res;
 }
 
 gboolean
 webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2*  class2param, gchar*  str_arg)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class2param, 0);
-    g_return_val_if_fail (str_arg, 0);
-    WebCore::Class2 * _g_class2param = WebKit::core(class2param);
-    g_return_val_if_fail (_g_class2param, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    gboolean res = item->callbackWithClass2Param(_g_class2param, _g_str_arg);
+    g_return_val_if_fail(class2param, 0);
+    g_return_val_if_fail(str_arg, 0);
+    WebCore::Class2 * converted_class2param = WebKit::core(class2param);
+    g_return_val_if_fail(converted_class2param, 0);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    gboolean res = item->callbackWithClass2Param(converted_class2param, converted_str_arg);
     return res;
 }
 
 glong
 webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3*  class3param)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail (class3param, 0);
-    WebCore::Class3 * _g_class3param = WebKit::core(class3param);
-    g_return_val_if_fail (_g_class3param, 0);
-    glong res = item->callbackWithNonBoolReturnType(_g_class3param);
+    g_return_val_if_fail(class3param, 0);
+    WebCore::Class3 * converted_class3param = WebKit::core(class3param);
+    g_return_val_if_fail(converted_class3param, 0);
+    glong res = item->callbackWithNonBoolReturnType(converted_class3param);
     return res;
 }
 
@@ -182,3 +184,4 @@ WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
     return wrapper;
 }
 } // namespace WebKit
+#endif /* ENABLE(DATABASE) */
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
index 0d0021d..af22530 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "config.h"
 
+#if ENABLE(Condition1) || ENABLE(Condition2)
+
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 #include "ExceptionCode.h"
@@ -138,3 +140,4 @@ WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface* coreObject)
     return wrapper;
 }
 } // namespace WebKit
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
index 5dfb255..efb362b 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
@@ -24,6 +24,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 #include "ExceptionCode.h"
+#include "HTMLNames.h"
 #include "TestObj.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
@@ -51,7 +52,7 @@ gpointer kit(WebCore::TestObj* obj)
 void
 webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->voidMethod();
 }
@@ -59,20 +60,20 @@ webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail (str_arg);
-    g_return_if_fail (obj_arg);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
-    g_return_if_fail (_g_obj_arg);
-    item->voidMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg);
+    g_return_if_fail(str_arg);
+    g_return_if_fail(obj_arg);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
+    g_return_if_fail(converted_obj_arg);
+    item->voidMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
 }
 
 glong
 webkit_dom_test_obj_int_method(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     glong res = item->intMethod();
     return res;
@@ -81,21 +82,21 @@ webkit_dom_test_obj_int_method(WebKitDOMTestObj* self)
 glong
 webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail (str_arg, 0);
-    g_return_val_if_fail (obj_arg, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
-    g_return_val_if_fail (_g_obj_arg, 0);
-    glong res = item->intMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg);
+    g_return_val_if_fail(str_arg, 0);
+    g_return_val_if_fail(obj_arg, 0);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
+    g_return_val_if_fail(converted_obj_arg, 0);
+    glong res = item->intMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
     return res;
 }
 
 WebKitDOMTestObj* 
 webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod());
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
@@ -105,14 +106,14 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
 WebKitDOMTestObj* 
 webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail (str_arg, 0);
-    g_return_val_if_fail (obj_arg, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
-    g_return_val_if_fail (_g_obj_arg, 0);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg));
+    g_return_val_if_fail(str_arg, 0);
+    g_return_val_if_fail(obj_arg, 0);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
+    g_return_val_if_fail(converted_obj_arg, 0);
+    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg));
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
     return res;
 }
@@ -120,14 +121,14 @@ webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg,
 WebKitDOMTestObj* 
 webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail (str_arg, 0);
-    g_return_val_if_fail (obj_arg, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
-    g_return_val_if_fail (_g_obj_arg, 0);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(_g_str_arg, _g_obj_arg));
+    g_return_val_if_fail(str_arg, 0);
+    g_return_val_if_fail(obj_arg, 0);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
+    g_return_val_if_fail(converted_obj_arg, 0);
+    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(converted_str_arg, converted_obj_arg));
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
     return res;
 }
@@ -135,15 +136,15 @@ webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, gchar*
 WebKitDOMTestObj* 
 webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, gchar*  str_arg, WebKitDOMTestObj*  obj_arg, GError **error)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail (str_arg, 0);
-    g_return_val_if_fail (obj_arg, 0);
-    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
-    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
-    g_return_val_if_fail (_g_obj_arg, 0);
+    g_return_val_if_fail(str_arg, 0);
+    g_return_val_if_fail(obj_arg, 0);
+    WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
+    WebCore::TestObj * 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(item->methodThatRequiresAllArgsAndThrows(_g_str_arg, _g_obj_arg, ec));
+    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(converted_str_arg, converted_obj_arg, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc;
         WebCore::getExceptionCodeDescription(ec, ecdesc);
@@ -156,18 +157,18 @@ webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* s
 void
 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue*  serialized_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail (serialized_arg);
-    WebCore::SerializedScriptValue * _g_serialized_arg = WebKit::core(serialized_arg);
-    g_return_if_fail (_g_serialized_arg);
-    item->serializedValue(_g_serialized_arg);
+    g_return_if_fail(serialized_arg);
+    WebCore::SerializedScriptValue * converted_serialized_arg = WebKit::core(serialized_arg);
+    g_return_if_fail(converted_serialized_arg);
+    item->serializedValue(converted_serialized_arg);
 }
 
 void
 webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->methodWithException(ec);
@@ -187,7 +188,7 @@ webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error
 void
 webkit_dom_test_obj_with_dynamic_frame(WebKitDOMTestObj* self)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withDynamicFrame();
 }
@@ -195,7 +196,7 @@ webkit_dom_test_obj_with_dynamic_frame(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_with_dynamic_frame_and_arg(WebKitDOMTestObj* self, glong int_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withDynamicFrameAndArg(int_arg);
 }
@@ -203,7 +204,7 @@ webkit_dom_test_obj_with_dynamic_frame_and_arg(WebKitDOMTestObj* self, glong int
 void
 webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self, glong int_arg, glong optional_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withDynamicFrameAndOptionalArg(int_arg, optional_arg);
 }
@@ -211,7 +212,7 @@ webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self,
 void
 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withDynamicFrameAndUserGesture(int_arg);
 }
@@ -219,7 +220,7 @@ webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self,
 void
 webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withDynamicFrameAndUserGestureASAD(int_arg, optional_arg);
 }
@@ -227,7 +228,7 @@ webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* s
 void
 webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withScriptStateVoid();
 }
@@ -235,7 +236,7 @@ webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
 WebKitDOMTestObj* 
 webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj());
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
@@ -245,7 +246,7 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->withScriptStateVoidException(ec);
@@ -259,7 +260,7 @@ 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)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObjException(ec));
@@ -275,7 +276,7 @@ webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GErr
 void
 webkit_dom_test_obj_with_script_execution_context(WebKitDOMTestObj* self)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->withScriptExecutionContext();
 }
@@ -283,7 +284,7 @@ webkit_dom_test_obj_with_script_execution_context(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->methodWithOptionalArg(opt);
 }
@@ -291,7 +292,7 @@ webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt)
 void
 webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->methodWithNonOptionalArgAndOptionalArg(non_opt, opt);
 }
@@ -299,7 +300,7 @@ webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestO
 void
 webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->methodWithNonOptionalArgAndTwoOptionalArgs(non_opt, opt1, opt2);
 }
@@ -307,7 +308,7 @@ webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOM
 glong
 webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     glong res = item->readOnlyIntAttr();
     return res;
@@ -316,7 +317,7 @@ webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self)
 gchar* 
 webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     gchar*  res = convertToUTF8String(item->readOnlyStringAttr());
     return res;
@@ -325,7 +326,7 @@ webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self)
 WebKitDOMTestObj* 
 webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr());
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
@@ -335,7 +336,7 @@ webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
 glong
 webkit_dom_test_obj_get_int_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     glong res = item->intAttr();
     return res;
@@ -344,7 +345,7 @@ webkit_dom_test_obj_get_int_attr(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_int_attr(WebKitDOMTestObj* self, glong value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->setIntAttr(value);
 }
@@ -352,7 +353,7 @@ webkit_dom_test_obj_set_int_attr(WebKitDOMTestObj* self, glong value)
 gint64
 webkit_dom_test_obj_get_long_long_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     gint64 res = item->longLongAttr();
     return res;
@@ -361,7 +362,7 @@ webkit_dom_test_obj_get_long_long_attr(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_long_long_attr(WebKitDOMTestObj* self, gint64 value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->setLongLongAttr(value);
 }
@@ -369,7 +370,7 @@ webkit_dom_test_obj_set_long_long_attr(WebKitDOMTestObj* self, gint64 value)
 guint64
 webkit_dom_test_obj_get_unsigned_long_long_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     guint64 res = item->unsignedLongLongAttr();
     return res;
@@ -378,7 +379,7 @@ webkit_dom_test_obj_get_unsigned_long_long_attr(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64 value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->setUnsignedLongLongAttr(value);
 }
@@ -386,7 +387,7 @@ webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64
 gchar* 
 webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     gchar*  res = convertToUTF8String(item->stringAttr());
     return res;
@@ -395,17 +396,17 @@ webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, gchar*  value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail (value);
-    WebCore::String _g_value = WebCore::String::fromUTF8(value);
-    item->setStringAttr(_g_value);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    item->setStringAttr(converted_value);
 }
 
 WebKitDOMTestObj* 
 webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr());
     WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
@@ -415,38 +416,165 @@ webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*  value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail (value);
-    WebCore::TestObj * _g_value = WebKit::core(value);
-    g_return_if_fail (_g_value);
-    item->setTestObjAttr(_g_value);
+    g_return_if_fail(value);
+    WebCore::TestObj * converted_value = WebKit::core(value);
+    g_return_if_fail(converted_value);
+    item->setTestObjAttr(converted_value);
+}
+
+gchar* 
+webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gchar*  res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, converted_value);
 }
 
 glong
-webkit_dom_test_obj_get_attr_with_exception(WebKitDOMTestObj* self)
+webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, value);
+}
+
+gboolean
+webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gboolean res = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean value)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->attrWithException();
+    item->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value);
+}
+
+gchar* 
+webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gchar*  res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
     return res;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_exception(WebKitDOMTestObj* self, glong value)
+webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
-    item->setAttrWithException(value);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, converted_value);
+}
+
+gchar* 
+webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gchar*  res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, converted_value);
 }
 
 glong
-webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_reflected_custom_integral_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_custom_integral_attr(WebKitDOMTestObj* self, glong value)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, value);
+}
+
+gboolean
+webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gboolean res = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gboolean value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value);
+}
+
+gchar* 
+webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gchar*  res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, converted_value);
+}
+
+glong
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
+{
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    glong res = item->attrWithSetterException(ec);
+    glong res = item->attrWithGetterException(ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc;
         WebCore::getExceptionCodeDescription(ec, ecdesc);
@@ -456,9 +584,32 @@ webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self, GErro
 }
 
 void
+webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::ExceptionCode ec = 0;
+    item->setAttrWithGetterException(value, ec);
+    if (ec) {
+        WebCore::ExceptionCodeDescription ecdesc;
+        WebCore::getExceptionCodeDescription(ec, ecdesc);
+        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
+    }
+}
+
+glong
+webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->attrWithSetterException();
+    return res;
+}
+
+void
 webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->setAttrWithSetterException(value, ec);
@@ -469,22 +620,50 @@ webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong
     }
 }
 
-glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self)
+gchar* 
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->attrWithGetterException();
+    WebCore::ExceptionCode ec = 0;
+    gchar*  res = convertToUTF8String(item->stringAttrWithGetterException(ec));
     return res;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
     WebCore::ExceptionCode ec = 0;
-    item->setAttrWithGetterException(value, ec);
+    item->setStringAttrWithGetterException(converted_value, ec);
+    if (ec) {
+        WebCore::ExceptionCodeDescription ecdesc;
+        WebCore::getExceptionCodeDescription(ec, ecdesc);
+        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
+    }
+}
+
+gchar* 
+webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    gchar*  res = convertToUTF8String(item->stringAttrWithSetterException());
+    return res;
+}
+
+void
+webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    g_return_if_fail(value);
+    WebCore::String converted_value = WebCore::String::fromUTF8(value);
+    WebCore::ExceptionCode ec = 0;
+    item->setStringAttrWithSetterException(converted_value, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc;
         WebCore::getExceptionCodeDescription(ec, ecdesc);
@@ -495,16 +674,79 @@ webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong
 gchar* 
 webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     gchar*  res = convertToUTF8String(item->scriptStringAttr());
     return res;
 }
 
+#if ENABLE(Condition1)
+glong
+webkit_dom_test_obj_get_conditional_attr1(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->conditionalAttr1();
+    return res;
+}
+#endif /* ENABLE(Condition1) */
+
+#if ENABLE(Condition1)
+void
+webkit_dom_test_obj_set_conditional_attr1(WebKitDOMTestObj* self, glong value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setConditionalAttr1(value);
+}
+#endif /* ENABLE(Condition1) */
+
+#if ENABLE(Condition1) && ENABLE(Condition2)
+glong
+webkit_dom_test_obj_get_conditional_attr2(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->conditionalAttr2();
+    return res;
+}
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+
+#if ENABLE(Condition1) && ENABLE(Condition2)
+void
+webkit_dom_test_obj_set_conditional_attr2(WebKitDOMTestObj* self, glong value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setConditionalAttr2(value);
+}
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
+glong
+webkit_dom_test_obj_get_conditional_attr3(WebKitDOMTestObj* self)
+{
+    g_return_val_if_fail(self, 0);
+    WebCore::TestObj * item = WebKit::core(self);
+    glong res = item->conditionalAttr3();
+    return res;
+}
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
+void
+webkit_dom_test_obj_set_conditional_attr3(WebKitDOMTestObj* self, glong value)
+{
+    g_return_if_fail(self);
+    WebCore::TestObj * item = WebKit::core(self);
+    item->setConditionalAttr3(value);
+}
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
 glong
 webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     glong res = item->description();
     return res;
@@ -513,7 +755,7 @@ webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
 glong
 webkit_dom_test_obj_get_id(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     glong res = item->id();
     return res;
@@ -522,7 +764,7 @@ webkit_dom_test_obj_get_id(WebKitDOMTestObj* self)
 void
 webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value)
 {
-    g_return_if_fail (self);
+    g_return_if_fail(self);
     WebCore::TestObj * item = WebKit::core(self);
     item->setId(value);
 }
@@ -530,7 +772,7 @@ webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value)
 gchar* 
 webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self)
 {
-    g_return_val_if_fail (self, 0);
+    g_return_val_if_fail(self, 0);
     WebCore::TestObj * item = WebKit::core(self);
     gchar*  res = convertToUTF8String(item->hash());
     return res;
@@ -562,11 +804,29 @@ enum {
     PROP_UNSIGNED_LONG_LONG_ATTR,
     PROP_STRING_ATTR,
     PROP_TEST_OBJ_ATTR,
-    PROP_ATTR_WITH_EXCEPTION,
-    PROP_ATTR_WITH_SETTER_EXCEPTION,
+    PROP_REFLECTED_STRING_ATTR,
+    PROP_REFLECTED_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_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_CUSTOM_ATTR,
     PROP_SCRIPT_STRING_ATTR,
+#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_DESCRIPTION,
     PROP_ID,
     PROP_HASH,
@@ -609,9 +869,50 @@ static void webkit_dom_test_obj_set_property(GObject* object, guint prop_id, con
         coreSelf->setStringAttr(WebCore::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_ATTR_WITH_EXCEPTION:
+    case PROP_REFLECTED_STRING_ATTR:
+    {
+        coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WebCore::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_BOOLEAN_ATTR:
+    {
+        coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
+        break;
+    }
+    case PROP_REFLECTED_URL_ATTR:
+    {
+        coreSelf->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
+        break;
+    }
+    case PROP_REFLECTED_STRING_ATTR:
+    {
+        coreSelf->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, WebCore::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->setAttrWithException((g_value_get_long(value)));
+        coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
+        break;
+    }
+    case PROP_REFLECTED_URL_ATTR:
+    {
+        coreSelf->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, WebCore::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:
@@ -620,12 +921,39 @@ static void webkit_dom_test_obj_set_property(GObject* object, guint prop_id, con
         coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
         break;
     }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
+    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
     {
         WebCore::ExceptionCode ec = 0;
-        coreSelf->setAttrWithGetterException((g_value_get_long(value)), ec);
+        coreSelf->setStringAttrWithGetterException(WebCore::String::fromUTF8(g_value_get_string(value)), ec);
+        break;
+    }
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
+    {
+        WebCore::ExceptionCode ec = 0;
+        coreSelf->setStringAttrWithSetterException(WebCore::String::fromUTF8(g_value_get_string(value)), ec);
+        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_ID:
     {
         coreSelf->setId((g_value_get_long(value)));
@@ -685,20 +1013,66 @@ static void webkit_dom_test_obj_get_property(GObject* object, guint prop_id, GVa
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_ATTR_WITH_EXCEPTION:
+    case PROP_REFLECTED_STRING_ATTR:
     {
-        g_value_set_long(value, coreSelf->attrWithException());
+        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_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_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_set_long(value, coreSelf->attrWithSetterException(ec));
+        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
         break;
     }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
     {
-        g_value_set_long(value, coreSelf->attrWithGetterException());
+        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
         break;
     }
     case PROP_SCRIPT_STRING_ATTR:
@@ -706,6 +1080,27 @@ static void webkit_dom_test_obj_get_property(GObject* object, guint prop_id, GVa
         g_value_take_string(value, convertToUTF8String(coreSelf->scriptStringAttr()));
         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_DESCRIPTION:
     {
         g_value_set_long(value, coreSelf->description());
@@ -800,24 +1195,66 @@ G_MAXUINT64, /* min */
                                                            WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
                                                            WEBKIT_PARAM_READWRITE));
     g_object_class_install_property(gobjectClass,
-                                    PROP_ATTR_WITH_EXCEPTION,
-                                    g_param_spec_long("attr-with-exception", /* name */
-                                                           "test_obj_attr-with-exception", /* short description */
-                                                           "read-write  glong TestObj.attr-with-exception", /* longer - could do with some extra doc stuff here */
+                                    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_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 */
+                                    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_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_ATTR_WITH_GETTER_EXCEPTION,
                                     g_param_spec_long("attr-with-getter-exception", /* name */
                                                            "test_obj_attr-with-getter-exception", /* short description */
@@ -827,12 +1264,68 @@ 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_SCRIPT_STRING_ATTR,
                                     g_param_spec_string("script-string-attr", /* name */
                                                            "test_obj_script-string-attr", /* short description */
                                                            "read-only  gchar*  TestObj.script-string-attr", /* longer - could do with some extra doc stuff here */
                                                            "", /* default */
                                                            WEBKIT_PARAM_READABLE));
+#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_DESCRIPTION,
                                     g_param_spec_long("description", /* name */
diff --git a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
index ef5ccb8..8dcd8c3 100644
--- a/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
+++ b/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
@@ -160,27 +160,111 @@ webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self);
 WEBKIT_API void
 webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*  value);
 
+WEBKIT_API gchar* 
+webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value);
+
 WEBKIT_API glong
-webkit_dom_test_obj_get_attr_with_exception(WebKitDOMTestObj* self);
+webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong value);
+
+WEBKIT_API gboolean
+webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean value);
+
+WEBKIT_API gchar* 
+webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value);
+
+WEBKIT_API gchar* 
+webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self);
 
 WEBKIT_API void
-webkit_dom_test_obj_set_attr_with_exception(WebKitDOMTestObj* self, glong value);
+webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value);
 
 WEBKIT_API glong
-webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_reflected_custom_integral_attr(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_reflected_custom_integral_attr(WebKitDOMTestObj* self, glong value);
+
+WEBKIT_API gboolean
+webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gboolean value);
+
+WEBKIT_API gchar* 
+webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value);
 
 WEBKIT_API glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self);
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
 
 WEBKIT_API void
 webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error);
 
+WEBKIT_API glong
+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_API gchar* 
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
+
+WEBKIT_API void
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error);
+
+WEBKIT_API gchar* 
+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, gchar*  value, GError **error);
+
 WEBKIT_API gchar* 
 webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self);
 
+#if ENABLE(Condition1)
+WEBKIT_API glong
+webkit_dom_test_obj_get_conditional_attr1(WebKitDOMTestObj* self);
+#endif /* ENABLE(Condition1) */
+
+#if ENABLE(Condition1)
+WEBKIT_API void
+webkit_dom_test_obj_set_conditional_attr1(WebKitDOMTestObj* self, glong value);
+#endif /* ENABLE(Condition1) */
+
+#if ENABLE(Condition1) && ENABLE(Condition2)
+WEBKIT_API glong
+webkit_dom_test_obj_get_conditional_attr2(WebKitDOMTestObj* self);
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+
+#if ENABLE(Condition1) && ENABLE(Condition2)
+WEBKIT_API void
+webkit_dom_test_obj_set_conditional_attr2(WebKitDOMTestObj* self, glong value);
+#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
+WEBKIT_API glong
+webkit_dom_test_obj_get_conditional_attr3(WebKitDOMTestObj* self);
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
+WEBKIT_API void
+webkit_dom_test_obj_set_conditional_attr3(WebKitDOMTestObj* self, glong value);
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+
 WEBKIT_API glong
 webkit_dom_test_obj_get_description(WebKitDOMTestObj* self);