[GTK] Some of DOM bindings macros are misnamed
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jun 2014 06:54:48 +0000 (06:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jun 2014 06:54:48 +0000 (06:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121543

Patch by Tomas Popela <tpopela@redhat.com> on 2014-06-24
Reviewed by Carlos Garcia Campos.

As we are using WebKitDOM as a namespace we should unify all type macros
to have WEBKIT_DOM_TYPE prefix instead of WEBKIT_TYPE_DOM. Also add
more exceptions to decamelize function in GObject bindings generator
to fix the names of bindings for BR, HR, UL, OL, DL and LI elements.

Source/WebCore:
* bindings/gobject/GObjectEventListener.cpp:
(WebCore::GObjectEventListener::handleEvent):
* bindings/gobject/WebKitDOMEventTarget.h:
* bindings/gobject/WebKitDOMNodeFilter.h:
* bindings/gobject/WebKitDOMObject.h:
* bindings/gobject/webkitdom.symbols:
* bindings/scripts/CodeGeneratorGObject.pm:
(decamelize):
(GetParentGObjType):
(GenerateProperty):
(GenerateHeader):
(GenerateCFile):
(GenerateEventTargetIface):
* bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
(WebKit::wrapFloat64Array):
* bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
(WebKit::wrapTestActiveDOMObject):
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(WebKit::wrapTestCallback):
* bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
* bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
(WebKit::wrapTestCustomNamedGetter):
* bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
(WebKit::wrapTestEventConstructor):
* bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
(WebKit::wrapTestEventTarget):
* bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
* bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
(WebKit::wrapTestException):
* bindings/scripts/test/GObject/WebKitDOMTestException.h:
* bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.cpp:
(WebKit::wrapTestGenerateIsReachable):
* bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.h:
* bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
(WebKit::wrapTestInterface):
(webkit_dom_test_interface_class_init):
* bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
(WebKit::wrapTestMediaQueryListListener):
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
* bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
(WebKit::wrapTestNamedConstructor):
* bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
* bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
(WebKit::wrapTestNode):
* bindings/scripts/test/GObject/WebKitDOMTestNode.h:
* bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp:
(WebKit::wrapTestNondeterministic):
* bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(WebKit::wrapTestObj):
(webkit_dom_test_obj_class_init):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp:
(WebKit::wrapTestOverloadedConstructors):
* bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
(WebKit::wrapTestSerializedScriptValueInterface):
(webkit_dom_test_serialized_script_value_interface_class_init):
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
(WebKit::wrapTestTypedefs):
(webkit_dom_test_typedefs_class_init):
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
* bindings/scripts/test/GObject/WebKitDOMattribute.cpp:
(WebKit::wrapattribute):
* bindings/scripts/test/GObject/WebKitDOMattribute.h:
* bindings/scripts/test/GObject/WebKitDOMreadonly.cpp:
(WebKit::wrapreadonly):
* bindings/scripts/test/GObject/WebKitDOMreadonly.h:

Tools:
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp:
* gtk/webkitdom.py:
(WebKitDOMDocGeneratorSections._dom_class_decamelize):
(WebKitDOMDocGeneratorSections.write_section):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

48 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bindings/gobject/GObjectEventListener.cpp
Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h
Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h
Source/WebCore/bindings/gobject/WebKitDOMObject.h
Source/WebCore/bindings/gobject/webkitdom.symbols
Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMreadonly.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMreadonly.h
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp
Tools/gtk/webkitdom.py

index a155696..ebb0f87 100644 (file)
@@ -1,3 +1,90 @@
+2014-06-24  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Some of DOM bindings macros are misnamed
+        https://bugs.webkit.org/show_bug.cgi?id=121543
+
+        Reviewed by Carlos Garcia Campos.
+
+        As we are using WebKitDOM as a namespace we should unify all type macros
+        to have WEBKIT_DOM_TYPE prefix instead of WEBKIT_TYPE_DOM. Also add
+        more exceptions to decamelize function in GObject bindings generator
+        to fix the names of bindings for BR, HR, UL, OL, DL and LI elements.
+
+        * bindings/gobject/GObjectEventListener.cpp:
+        (WebCore::GObjectEventListener::handleEvent):
+        * bindings/gobject/WebKitDOMEventTarget.h:
+        * bindings/gobject/WebKitDOMNodeFilter.h:
+        * bindings/gobject/WebKitDOMObject.h:
+        * bindings/gobject/webkitdom.symbols:
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (decamelize):
+        (GetParentGObjType):
+        (GenerateProperty):
+        (GenerateHeader):
+        (GenerateCFile):
+        (GenerateEventTargetIface):
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
+        (WebKit::wrapFloat64Array):
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
+        (WebKit::wrapTestActiveDOMObject):
+        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+        (WebKit::wrapTestCallback):
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
+        (WebKit::wrapTestCustomNamedGetter):
+        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
+        (WebKit::wrapTestEventConstructor):
+        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
+        (WebKit::wrapTestEventTarget):
+        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
+        (WebKit::wrapTestException):
+        * bindings/scripts/test/GObject/WebKitDOMTestException.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.cpp:
+        (WebKit::wrapTestGenerateIsReachable):
+        * bindings/scripts/test/GObject/WebKitDOMTestGenerateIsReachable.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+        (WebKit::wrapTestInterface):
+        (webkit_dom_test_interface_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
+        (WebKit::wrapTestMediaQueryListListener):
+        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
+        (WebKit::wrapTestNamedConstructor):
+        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
+        (WebKit::wrapTestNode):
+        * bindings/scripts/test/GObject/WebKitDOMTestNode.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp:
+        (WebKit::wrapTestNondeterministic):
+        * bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+        (WebKit::wrapTestObj):
+        (webkit_dom_test_obj_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp:
+        (WebKit::wrapTestOverloadedConstructors):
+        * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+        (WebKit::wrapTestSerializedScriptValueInterface):
+        (webkit_dom_test_serialized_script_value_interface_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+        (WebKit::wrapTestTypedefs):
+        (webkit_dom_test_typedefs_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+        * bindings/scripts/test/GObject/WebKitDOMattribute.cpp:
+        (WebKit::wrapattribute):
+        * bindings/scripts/test/GObject/WebKitDOMattribute.h:
+        * bindings/scripts/test/GObject/WebKitDOMreadonly.cpp:
+        (WebKit::wrapreadonly):
+        * bindings/scripts/test/GObject/WebKitDOMreadonly.h:
+
 2014-06-24  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r170414.
index 3a39c7e..76cf279 100644 (file)
@@ -64,11 +64,11 @@ void GObjectEventListener::gobjectDestroyed()
 void GObjectEventListener::handleEvent(ScriptExecutionContext*, Event* event)
 {
     GValue parameters[2] = { G_VALUE_INIT, G_VALUE_INIT };
-    g_value_init(&parameters[0], WEBKIT_TYPE_DOM_EVENT_TARGET);
+    g_value_init(&parameters[0], WEBKIT_DOM_TYPE_EVENT_TARGET);
     g_value_set_object(&parameters[0], m_target);
 
     GRefPtr<WebKitDOMEvent> domEvent = adoptGRef(WebKit::kit(event));
-    g_value_init(&parameters[1], WEBKIT_TYPE_DOM_EVENT);
+    g_value_init(&parameters[1], WEBKIT_DOM_TYPE_EVENT);
     g_value_set_object(&parameters[1], domEvent.get());
 
     g_closure_invoke(m_handler.get(), 0, 2, parameters, NULL);
index 3d3d660..3420f15 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_EVENT_TARGET            (webkit_dom_event_target_get_type ())
-#define WEBKIT_DOM_EVENT_TARGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_TYPE_DOM_EVENT_TARGET, WebKitDOMEventTarget))
-#define WEBKIT_DOM_EVENT_TARGET_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), WEBKIT_TYPE_DOM_EVENT_TARGET, WebKitDOMEventTargetIface))
-#define WEBKIT_DOM_IS_EVENT_TARGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_TYPE_DOM_EVENT_TARGET))
-#define WEBKIT_DOM_EVENT_TARGET_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_TYPE_DOM_EVENT_TARGET, WebKitDOMEventTargetIface))
+#define WEBKIT_DOM_TYPE_EVENT_TARGET            (webkit_dom_event_target_get_type ())
+#define WEBKIT_DOM_EVENT_TARGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET, WebKitDOMEventTarget))
+#define WEBKIT_DOM_EVENT_TARGET_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET, WebKitDOMEventTargetIface))
+#define WEBKIT_DOM_IS_EVENT_TARGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET))
+#define WEBKIT_DOM_EVENT_TARGET_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET, WebKitDOMEventTargetIface))
 
 typedef struct _WebKitDOMEventTargetIface WebKitDOMEventTargetIface;
 
index 8a98a61..5d1d3fd 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_NODE_FILTER            (webkit_dom_node_filter_get_type ())
-#define WEBKIT_DOM_NODE_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_TYPE_DOM_NODE_FILTER, WebKitDOMNodeFilter))
-#define WEBKIT_DOM_NODE_FILTER_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), WEBKIT_TYPE_DOM_NODE_FILTER, WebKitDOMNodeFilterIface))
-#define WEBKIT_DOM_IS_NODE_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_TYPE_DOM_NODE_FILTER))
-#define WEBKIT_DOM_NODE_FILTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_TYPE_DOM_NODE_FILTER, WebKitDOMNodeFilterIface))
+#define WEBKIT_DOM_TYPE_NODE_FILTER            (webkit_dom_node_filter_get_type ())
+#define WEBKIT_DOM_NODE_FILTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_DOM_TYPE_NODE_FILTER, WebKitDOMNodeFilter))
+#define WEBKIT_DOM_NODE_FILTER_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), WEBKIT_DOM_TYPE_NODE_FILTER, WebKitDOMNodeFilterIface))
+#define WEBKIT_DOM_IS_NODE_FILTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_DOM_TYPE_NODE_FILTER))
+#define WEBKIT_DOM_NODE_FILTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_DOM_TYPE_NODE_FILTER, WebKitDOMNodeFilterIface))
 
 /**
  * WEBKIT_DOM_NODE_FILTER_ACCEPT:
index 3556b79..9b7b867 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_OBJECT            (webkit_dom_object_get_type())
-#define WEBKIT_DOM_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_OBJECT, WebKitDOMObject))
-#define WEBKIT_DOM_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_OBJECT, WebKitDOMObjectClass))
-#define WEBKIT_IS_DOM_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_OBJECT))
-#define WEBKIT_IS_DOM_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_OBJECT))
-#define WEBKIT_DOM_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_OBJECT, WebKitDOMObjectClass))
+#define WEBKIT_DOM_TYPE_OBJECT            (webkit_dom_object_get_type())
+#define WEBKIT_DOM_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_OBJECT, WebKitDOMObject))
+#define WEBKIT_DOM_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_OBJECT, WebKitDOMObjectClass))
+#define WEBKIT_DOM_IS_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_OBJECT))
+#define WEBKIT_DOM_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_OBJECT))
+#define WEBKIT_DOM_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_OBJECT, WebKitDOMObjectClass))
 
 typedef struct _WebKitDOMObjectPrivate WebKitDOMObjectPrivate;
 
index a798f5f..020a465 100644 (file)
@@ -302,9 +302,9 @@ gchar* webkit_dom_html_base_element_get_href(WebKitDOMHTMLBaseElement*)
 gchar* webkit_dom_html_base_element_get_target(WebKitDOMHTMLBaseElement*)
 void webkit_dom_html_base_element_set_href(WebKitDOMHTMLBaseElement*, const gchar*)
 void webkit_dom_html_base_element_set_target(WebKitDOMHTMLBaseElement*, const gchar*)
-GType webkit_dom_htmlbr_element_get_type(void)
-gchar* webkit_dom_htmlbr_element_get_clear(WebKitDOMHTMLBRElement*)
-void webkit_dom_htmlbr_element_set_clear(WebKitDOMHTMLBRElement*, const gchar*)
+GType webkit_dom_html_br_element_get_type(void)
+gchar* webkit_dom_html_br_element_get_clear(WebKitDOMHTMLBRElement*)
+void webkit_dom_html_br_element_set_clear(WebKitDOMHTMLBRElement*, const gchar*)
 GType webkit_dom_html_base_font_element_get_type(void)
 gchar* webkit_dom_html_base_font_element_get_color(WebKitDOMHTMLBaseFontElement*)
 gchar* webkit_dom_html_base_font_element_get_face(WebKitDOMHTMLBaseFontElement*)
@@ -345,9 +345,9 @@ GType webkit_dom_html_collection_get_type(void)
 gulong webkit_dom_html_collection_get_length(WebKitDOMHTMLCollection*)
 WebKitDOMNode* webkit_dom_html_collection_item(WebKitDOMHTMLCollection*, gulong)
 WebKitDOMNode* webkit_dom_html_collection_named_item(WebKitDOMHTMLCollection*, const gchar*)
-GType webkit_dom_htmld_list_element_get_type(void)
-gboolean webkit_dom_htmld_list_element_get_compact(WebKitDOMHTMLDListElement*)
-void webkit_dom_htmld_list_element_set_compact(WebKitDOMHTMLDListElement*, gboolean)
+GType webkit_dom_html_d_list_element_get_type(void)
+gboolean webkit_dom_html_d_list_element_get_compact(WebKitDOMHTMLDListElement*)
+void webkit_dom_html_d_list_element_set_compact(WebKitDOMHTMLDListElement*, gboolean)
 GType webkit_dom_html_directory_element_get_type(void)
 gboolean webkit_dom_html_directory_element_get_compact(WebKitDOMHTMLDirectoryElement*)
 void webkit_dom_html_directory_element_set_compact(WebKitDOMHTMLDirectoryElement*, gboolean)
@@ -468,15 +468,15 @@ gchar* webkit_dom_html_frame_set_element_get_cols(WebKitDOMHTMLFrameSetElement*)
 gchar* webkit_dom_html_frame_set_element_get_rows(WebKitDOMHTMLFrameSetElement*)
 void webkit_dom_html_frame_set_element_set_cols(WebKitDOMHTMLFrameSetElement*, const gchar*)
 void webkit_dom_html_frame_set_element_set_rows(WebKitDOMHTMLFrameSetElement*, const gchar*)
-GType webkit_dom_htmlhr_element_get_type(void)
-gchar* webkit_dom_htmlhr_element_get_align(WebKitDOMHTMLHRElement*)
-gboolean webkit_dom_htmlhr_element_get_no_shade(WebKitDOMHTMLHRElement*)
-gchar* webkit_dom_htmlhr_element_get_size(WebKitDOMHTMLHRElement*)
-gchar* webkit_dom_htmlhr_element_get_width(WebKitDOMHTMLHRElement*)
-void webkit_dom_htmlhr_element_set_align(WebKitDOMHTMLHRElement*, const gchar*)
-void webkit_dom_htmlhr_element_set_no_shade(WebKitDOMHTMLHRElement*, gboolean)
-void webkit_dom_htmlhr_element_set_size(WebKitDOMHTMLHRElement*, const gchar*)
-void webkit_dom_htmlhr_element_set_width(WebKitDOMHTMLHRElement*, const gchar*)
+GType webkit_dom_html_hr_element_get_type(void)
+gchar* webkit_dom_html_hr_element_get_align(WebKitDOMHTMLHRElement*)
+gboolean webkit_dom_html_hr_element_get_no_shade(WebKitDOMHTMLHRElement*)
+gchar* webkit_dom_html_hr_element_get_size(WebKitDOMHTMLHRElement*)
+gchar* webkit_dom_html_hr_element_get_width(WebKitDOMHTMLHRElement*)
+void webkit_dom_html_hr_element_set_align(WebKitDOMHTMLHRElement*, const gchar*)
+void webkit_dom_html_hr_element_set_no_shade(WebKitDOMHTMLHRElement*, gboolean)
+void webkit_dom_html_hr_element_set_size(WebKitDOMHTMLHRElement*, const gchar*)
+void webkit_dom_html_hr_element_set_width(WebKitDOMHTMLHRElement*, const gchar*)
 GType webkit_dom_html_head_element_get_type(void)
 gchar* webkit_dom_html_head_element_get_profile(WebKitDOMHTMLHeadElement*)
 void webkit_dom_html_head_element_set_profile(WebKitDOMHTMLHeadElement*, const gchar*)
@@ -585,9 +585,9 @@ void webkit_dom_html_input_element_set_use_map(WebKitDOMHTMLInputElement*, const
 void webkit_dom_html_input_element_set_value(WebKitDOMHTMLInputElement*, const gchar*)
 void webkit_dom_html_input_element_set_width(WebKitDOMHTMLInputElement*, gulong)
 gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
-GType webkit_dom_htmlli_element_get_type(void)
-glong webkit_dom_htmlli_element_get_value(WebKitDOMHTMLLIElement*)
-void webkit_dom_htmlli_element_set_value(WebKitDOMHTMLLIElement*, glong)
+GType webkit_dom_html_li_element_get_type(void)
+glong webkit_dom_html_li_element_get_value(WebKitDOMHTMLLIElement*)
+void webkit_dom_html_li_element_set_value(WebKitDOMHTMLLIElement*, glong)
 GType webkit_dom_html_label_element_get_type(void)
 WebKitDOMHTMLFormElement* webkit_dom_html_label_element_get_form(WebKitDOMHTMLLabelElement*)
 gchar* webkit_dom_html_label_element_get_html_for(WebKitDOMHTMLLabelElement*)
@@ -638,11 +638,11 @@ gchar* webkit_dom_html_mod_element_get_cite(WebKitDOMHTMLModElement*)
 gchar* webkit_dom_html_mod_element_get_date_time(WebKitDOMHTMLModElement*)
 void webkit_dom_html_mod_element_set_cite(WebKitDOMHTMLModElement*, const gchar*)
 void webkit_dom_html_mod_element_set_date_time(WebKitDOMHTMLModElement*, const gchar*)
-GType webkit_dom_htmlo_list_element_get_type(void)
-gboolean webkit_dom_htmlo_list_element_get_compact(WebKitDOMHTMLOListElement*)
-glong webkit_dom_htmlo_list_element_get_start(WebKitDOMHTMLOListElement*)
-void webkit_dom_htmlo_list_element_set_compact(WebKitDOMHTMLOListElement*, gboolean)
-void webkit_dom_htmlo_list_element_set_start(WebKitDOMHTMLOListElement*, glong)
+GType webkit_dom_html_o_list_element_get_type(void)
+gboolean webkit_dom_html_o_list_element_get_compact(WebKitDOMHTMLOListElement*)
+glong webkit_dom_html_o_list_element_get_start(WebKitDOMHTMLOListElement*)
+void webkit_dom_html_o_list_element_set_compact(WebKitDOMHTMLOListElement*, gboolean)
+void webkit_dom_html_o_list_element_set_start(WebKitDOMHTMLOListElement*, glong)
 GType webkit_dom_html_object_element_get_type(void)
 gchar* webkit_dom_html_object_element_get_align(WebKitDOMHTMLObjectElement*)
 gchar* webkit_dom_html_object_element_get_archive(WebKitDOMHTMLObjectElement*)
@@ -896,9 +896,9 @@ gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElemen
 GType webkit_dom_html_title_element_get_type(void)
 gchar* webkit_dom_html_title_element_get_text(WebKitDOMHTMLTitleElement*)
 void webkit_dom_html_title_element_set_text(WebKitDOMHTMLTitleElement*, const gchar*)
-GType webkit_dom_htmlu_list_element_get_type(void)
-gboolean webkit_dom_htmlu_list_element_get_compact(WebKitDOMHTMLUListElement*)
-void webkit_dom_htmlu_list_element_set_compact(WebKitDOMHTMLUListElement*, gboolean)
+GType webkit_dom_html_u_list_element_get_type(void)
+gboolean webkit_dom_html_u_list_element_get_compact(WebKitDOMHTMLUListElement*)
+void webkit_dom_html_u_list_element_set_compact(WebKitDOMHTMLUListElement*, gboolean)
 GType webkit_dom_style_sheet_list_get_type(void)
 gulong webkit_dom_style_sheet_list_get_length(WebKitDOMStyleSheetList*)
 WebKitDOMStyleSheet* webkit_dom_style_sheet_list_item(WebKitDOMStyleSheetList*, gulong)
index 1830cbe..4add5e1 100644 (file)
@@ -158,6 +158,12 @@ sub decamelize
             s/x_path/xpath/;
             s/web_kit/webkit/;
             s/htmli_frame/html_iframe/;
+            s/htmlbr/html_br/;
+            s/htmlli/html_li/;
+            s/htmlhr/html_hr/;
+            s/htmld/html_d/;
+            s/htmlo/html_o/;
+            s/htmlu/html_u/;
         }
         return $s;
 }
@@ -180,8 +186,8 @@ sub HumanReadableConditional {
 sub GetParentGObjType {
     my $interface = shift;
 
-    return "WEBKIT_TYPE_DOM_OBJECT" unless $interface->parent;
-    return "WEBKIT_TYPE_DOM_" . uc(decamelize(($interface->parent)));
+    return "WEBKIT_DOM_TYPE_OBJECT" unless $interface->parent;
+    return "WEBKIT_DOM_TYPE_" . uc(decamelize(($interface->parent)));
 }
 
 sub GetClassName {
@@ -602,7 +608,7 @@ sub GenerateProperty {
                                 "uchar" =>   [ "G_MININT8", "G_MAXINT8", "0" ],
                                 "char" =>    [ "0", "G_MAXUINT8", "0" ],
                                 "string" =>  [ '""', ],
-                                "object" =>  [ "WEBKIT_TYPE_DOM_${ucPropGType}" ]);
+                                "object" =>  [ "WEBKIT_DOM_TYPE_${ucPropGType}" ]);
 
     my $extraParameters = join(", ", @{$parameterSpecOptions{$gtype}});
     my $glibTypeName = GetGlibTypeName($propType);
@@ -855,12 +861,12 @@ EOF
     my $lowerCaseIfaceName = "webkit_dom_$decamelize";
 
     $implContent = << "EOF";
-#define WEBKIT_TYPE_DOM_${clsCaps}            (${lowerCaseIfaceName}_get_type())
-#define WEBKIT_DOM_${clsCaps}(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_${clsCaps}, ${className}))
-#define WEBKIT_DOM_${clsCaps}_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_${clsCaps}, ${className}Class)
-#define WEBKIT_DOM_IS_${clsCaps}(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_${clsCaps}))
-#define WEBKIT_DOM_IS_${clsCaps}_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_${clsCaps}))
-#define WEBKIT_DOM_${clsCaps}_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_${clsCaps}, ${className}Class))
+#define WEBKIT_DOM_TYPE_${clsCaps}            (${lowerCaseIfaceName}_get_type())
+#define WEBKIT_DOM_${clsCaps}(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_${clsCaps}, ${className}))
+#define WEBKIT_DOM_${clsCaps}_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_${clsCaps}, ${className}Class)
+#define WEBKIT_DOM_IS_${clsCaps}(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_${clsCaps}))
+#define WEBKIT_DOM_IS_${clsCaps}_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_${clsCaps}))
+#define WEBKIT_DOM_${clsCaps}_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_${clsCaps}, ${className}Class))
 
 struct _${className} {
     ${parentClassName} parent_instance;
@@ -1363,7 +1369,7 @@ sub GenerateCFile {
     # for the WebCore wrapped object and make sure we only increment the reference counter once.
     if ($parentImplClassName eq "Object") {
         my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
-        push(@cStructPriv, "#define WEBKIT_DOM_${clsCaps}_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_${clsCaps}, ${className}Private)\n\n");
+        push(@cStructPriv, "#define WEBKIT_DOM_${clsCaps}_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_${clsCaps}, ${className}Private)\n\n");
         push(@cStructPriv, "typedef struct _${className}Private {\n");
         push(@cStructPriv, "#if ${conditionalString}\n") if $conditionalString;
         push(@cStructPriv, "    RefPtr<WebCore::${interfaceName}> coreObject;\n");
@@ -1414,7 +1420,7 @@ WebCore::${interfaceName}* core(${className}* request)
 ${className}* wrap${interfaceName}(WebCore::${interfaceName}* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_TYPE_DOM_${clsCaps}, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_DOM_TYPE_${clsCaps}, "core-object", coreObject, nullptr));
 }
 
 EOF
@@ -1513,7 +1519,7 @@ sub GenerateEventTargetIface {
     push(@cBodyProperties, "    iface->remove_event_listener = webkit_dom_${decamelize}_remove_event_listener;\n}\n\n");
 
     $defineTypeMacro = "G_DEFINE_TYPE_WITH_CODE";
-    $defineTypeInterfaceImplementation = ", G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_EVENT_TARGET, webkit_dom_event_target_init))";
+    $defineTypeInterfaceImplementation = ", G_IMPLEMENT_INTERFACE(WEBKIT_DOM_TYPE_EVENT_TARGET, webkit_dom_event_target_init))";
 }
 
 sub Generate {
index c31a737..5392d95 100644 (file)
@@ -49,12 +49,12 @@ WebCore::Float64Array* core(WebKitDOMFloat64Array* request)
 WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_DOM_TYPE_FLOAT64ARRAY, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMFloat64Array, webkit_dom_float64array, WEBKIT_TYPE_DOM_ARRAY_BUFFER_VIEW)
+G_DEFINE_TYPE(WebKitDOMFloat64Array, webkit_dom_float64array, WEBKIT_DOM_TYPE_ARRAY_BUFFER_VIEW)
 
 static void webkit_dom_float64array_class_init(WebKitDOMFloat64ArrayClass* requestClass)
 {
index 4dda259..d7f0d07 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_FLOAT64ARRAY            (webkit_dom_float64array_get_type())
-#define WEBKIT_DOM_FLOAT64ARRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_FLOAT64ARRAY, WebKitDOMFloat64Array))
-#define WEBKIT_DOM_FLOAT64ARRAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_FLOAT64ARRAY, WebKitDOMFloat64ArrayClass)
-#define WEBKIT_DOM_IS_FLOAT64ARRAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_FLOAT64ARRAY))
-#define WEBKIT_DOM_IS_FLOAT64ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_FLOAT64ARRAY))
-#define WEBKIT_DOM_FLOAT64ARRAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_FLOAT64ARRAY, WebKitDOMFloat64ArrayClass))
+#define WEBKIT_DOM_TYPE_FLOAT64ARRAY            (webkit_dom_float64array_get_type())
+#define WEBKIT_DOM_FLOAT64ARRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_FLOAT64ARRAY, WebKitDOMFloat64Array))
+#define WEBKIT_DOM_FLOAT64ARRAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_FLOAT64ARRAY, WebKitDOMFloat64ArrayClass)
+#define WEBKIT_DOM_IS_FLOAT64ARRAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_FLOAT64ARRAY))
+#define WEBKIT_DOM_IS_FLOAT64ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_FLOAT64ARRAY))
+#define WEBKIT_DOM_FLOAT64ARRAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_FLOAT64ARRAY, WebKitDOMFloat64ArrayClass))
 
 struct _WebKitDOMFloat64Array {
     WebKitDOMArrayBufferView parent_instance;
index 4dd07fd..e591896 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectPrivate)
+#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectPrivate)
 
 typedef struct _WebKitDOMTestActiveDOMObjectPrivate {
     RefPtr<WebCore::TestActiveDOMObject> coreObject;
@@ -60,12 +60,12 @@ WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request)
 WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestActiveDOMObject, webkit_dom_test_active_dom_object, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestActiveDOMObject, webkit_dom_test_active_dom_object, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
index a2c1252..20467a6 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT            (webkit_dom_test_active_dom_object_get_type())
-#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObject))
-#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectClass)
-#define WEBKIT_DOM_IS_TEST_ACTIVE_DOM_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT))
-#define WEBKIT_DOM_IS_TEST_ACTIVE_DOM_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT))
-#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectClass))
+#define WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT            (webkit_dom_test_active_dom_object_get_type())
+#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObject))
+#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectClass)
+#define WEBKIT_DOM_IS_TEST_ACTIVE_DOM_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT))
+#define WEBKIT_DOM_IS_TEST_ACTIVE_DOM_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT))
+#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObjectClass))
 
 struct _WebKitDOMTestActiveDOMObject {
     WebKitDOMObject parent_instance;
index 62e82db..9e49a35 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_CALLBACK, WebKitDOMTestCallbackPrivate)
+#define WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallbackPrivate)
 
 typedef struct _WebKitDOMTestCallbackPrivate {
 #if ENABLE(SQL_DATABASE)
@@ -67,14 +67,14 @@ WebCore::TestCallback* core(WebKitDOMTestCallback* request)
 WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_DOM_TYPE_TEST_CALLBACK, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(SQL_DATABASE)
 
-G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_callback_finalize(GObject* object)
 {
index 94f3372..9f60f30 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_CALLBACK            (webkit_dom_test_callback_get_type())
-#define WEBKIT_DOM_TEST_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_CALLBACK, WebKitDOMTestCallback))
-#define WEBKIT_DOM_TEST_CALLBACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_CALLBACK, WebKitDOMTestCallbackClass)
-#define WEBKIT_DOM_IS_TEST_CALLBACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_CALLBACK))
-#define WEBKIT_DOM_IS_TEST_CALLBACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_CALLBACK))
-#define WEBKIT_DOM_TEST_CALLBACK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_CALLBACK, WebKitDOMTestCallbackClass))
+#define WEBKIT_DOM_TYPE_TEST_CALLBACK            (webkit_dom_test_callback_get_type())
+#define WEBKIT_DOM_TEST_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallback))
+#define WEBKIT_DOM_TEST_CALLBACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallbackClass)
+#define WEBKIT_DOM_IS_TEST_CALLBACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_CALLBACK))
+#define WEBKIT_DOM_IS_TEST_CALLBACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_CALLBACK))
+#define WEBKIT_DOM_TEST_CALLBACK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallbackClass))
 
 struct _WebKitDOMTestCallback {
     WebKitDOMObject parent_instance;
index 1a507f0..d44eadb 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterPrivate)
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterPrivate)
 
 typedef struct _WebKitDOMTestCustomNamedGetterPrivate {
     RefPtr<WebCore::TestCustomNamedGetter> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
 WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
 {
index c7a84a5..5856c10 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER            (webkit_dom_test_custom_named_getter_get_type())
-#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetter))
-#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass)
-#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER))
-#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER))
-#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass))
+#define WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER            (webkit_dom_test_custom_named_getter_get_type())
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetter))
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass)
+#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER))
+#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER))
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass))
 
 struct _WebKitDOMTestCustomNamedGetter {
     WebKitDOMObject parent_instance;
index 8d28b29..2de9e10 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorPrivate)
+#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorPrivate)
 
 typedef struct _WebKitDOMTestEventConstructorPrivate {
     RefPtr<WebCore::TestEventConstructor> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request)
 WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestEventConstructor, webkit_dom_test_event_constructor, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestEventConstructor, webkit_dom_test_event_constructor, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
index e3ba7ec..663fbce 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR            (webkit_dom_test_event_constructor_get_type())
-#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructor))
-#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorClass)
-#define WEBKIT_DOM_IS_TEST_EVENT_CONSTRUCTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR))
-#define WEBKIT_DOM_IS_TEST_EVENT_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR))
-#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorClass))
+#define WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR            (webkit_dom_test_event_constructor_get_type())
+#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructor))
+#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorClass)
+#define WEBKIT_DOM_IS_TEST_EVENT_CONSTRUCTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR))
+#define WEBKIT_DOM_IS_TEST_EVENT_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR))
+#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructorClass))
 
 struct _WebKitDOMTestEventConstructor {
     WebKitDOMObject parent_instance;
index 1969f09..e6e3967 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_EVENT_TARGET_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, WebKitDOMTestEventTargetPrivate)
+#define WEBKIT_DOM_TEST_EVENT_TARGET_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_EVENT_TARGET, WebKitDOMTestEventTargetPrivate)
 
 typedef struct _WebKitDOMTestEventTargetPrivate {
     RefPtr<WebCore::TestEventTarget> coreObject;
@@ -63,7 +63,7 @@ WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request)
 WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_DOM_TYPE_TEST_EVENT_TARGET, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -101,7 +101,7 @@ static void webkit_dom_event_target_init(WebKitDOMEventTargetIface* iface)
     iface->remove_event_listener = webkit_dom_test_event_target_remove_event_listener;
 }
 
-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))
+G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestEventTarget, webkit_dom_test_event_target, WEBKIT_DOM_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(WEBKIT_DOM_TYPE_EVENT_TARGET, webkit_dom_event_target_init))
 
 static void webkit_dom_test_event_target_finalize(GObject* object)
 {
index 8ff9ca7..8c76668 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_EVENT_TARGET            (webkit_dom_test_event_target_get_type())
-#define WEBKIT_DOM_TEST_EVENT_TARGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, WebKitDOMTestEventTarget))
-#define WEBKIT_DOM_TEST_EVENT_TARGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, WebKitDOMTestEventTargetClass)
-#define WEBKIT_DOM_IS_TEST_EVENT_TARGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_EVENT_TARGET))
-#define WEBKIT_DOM_IS_TEST_EVENT_TARGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_EVENT_TARGET))
-#define WEBKIT_DOM_TEST_EVENT_TARGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, WebKitDOMTestEventTargetClass))
+#define WEBKIT_DOM_TYPE_TEST_EVENT_TARGET            (webkit_dom_test_event_target_get_type())
+#define WEBKIT_DOM_TEST_EVENT_TARGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_EVENT_TARGET, WebKitDOMTestEventTarget))
+#define WEBKIT_DOM_TEST_EVENT_TARGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_EVENT_TARGET, WebKitDOMTestEventTargetClass)
+#define WEBKIT_DOM_IS_TEST_EVENT_TARGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_EVENT_TARGET))
+#define WEBKIT_DOM_IS_TEST_EVENT_TARGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_EVENT_TARGET))
+#define WEBKIT_DOM_TEST_EVENT_TARGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_EVENT_TARGET, WebKitDOMTestEventTargetClass))
 
 struct _WebKitDOMTestEventTarget {
     WebKitDOMObject parent_instance;
index 836d31c..a6de21f 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_EXCEPTION_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_EXCEPTION, WebKitDOMTestExceptionPrivate)
+#define WEBKIT_DOM_TEST_EXCEPTION_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_EXCEPTION, WebKitDOMTestExceptionPrivate)
 
 typedef struct _WebKitDOMTestExceptionPrivate {
     RefPtr<WebCore::TestException> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestException* core(WebKitDOMTestException* request)
 WebKitDOMTestException* wrapTestException(WebCore::TestException* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_EXCEPTION(g_object_new(WEBKIT_TYPE_DOM_TEST_EXCEPTION, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_EXCEPTION(g_object_new(WEBKIT_DOM_TYPE_TEST_EXCEPTION, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestException, webkit_dom_test_exception, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestException, webkit_dom_test_exception, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
index 4bb2fbc..6274553 100644 (file)
 
 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))
+#define WEBKIT_DOM_TYPE_TEST_EXCEPTION            (webkit_dom_test_exception_get_type())
+#define WEBKIT_DOM_TEST_EXCEPTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_EXCEPTION, WebKitDOMTestException))
+#define WEBKIT_DOM_TEST_EXCEPTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_EXCEPTION, WebKitDOMTestExceptionClass)
+#define WEBKIT_DOM_IS_TEST_EXCEPTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_EXCEPTION))
+#define WEBKIT_DOM_IS_TEST_EXCEPTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_EXCEPTION))
+#define WEBKIT_DOM_TEST_EXCEPTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_EXCEPTION, WebKitDOMTestExceptionClass))
 
 struct _WebKitDOMTestException {
     WebKitDOMObject parent_instance;
index c8587ec..83c5a13 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachablePrivate)
+#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachablePrivate)
 
 typedef struct _WebKitDOMTestGenerateIsReachablePrivate {
     RefPtr<WebCore::TestGenerateIsReachable> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestGenerateIsReachable* core(WebKitDOMTestGenerateIsReachable* request
 WebKitDOMTestGenerateIsReachable* wrapTestGenerateIsReachable(WebCore::TestGenerateIsReachable* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE(g_object_new(WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE(g_object_new(WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestGenerateIsReachable, webkit_dom_test_generate_is_reachable, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestGenerateIsReachable, webkit_dom_test_generate_is_reachable, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_generate_is_reachable_finalize(GObject* object)
 {
index bb3c209..28498dc 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE            (webkit_dom_test_generate_is_reachable_get_type())
-#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachable))
-#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachableClass)
-#define WEBKIT_DOM_IS_TEST_GENERATE_IS_REACHABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE))
-#define WEBKIT_DOM_IS_TEST_GENERATE_IS_REACHABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE))
-#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachableClass))
+#define WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE            (webkit_dom_test_generate_is_reachable_get_type())
+#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachable))
+#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachableClass)
+#define WEBKIT_DOM_IS_TEST_GENERATE_IS_REACHABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE))
+#define WEBKIT_DOM_IS_TEST_GENERATE_IS_REACHABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE))
+#define WEBKIT_DOM_TEST_GENERATE_IS_REACHABLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_GENERATE_IS_REACHABLE, WebKitDOMTestGenerateIsReachableClass))
 
 struct _WebKitDOMTestGenerateIsReachable {
     WebKitDOMObject parent_instance;
index 28b344c..837685a 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_INTERFACE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_INTERFACE, WebKitDOMTestInterfacePrivate)
+#define WEBKIT_DOM_TEST_INTERFACE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_INTERFACE, WebKitDOMTestInterfacePrivate)
 
 typedef struct _WebKitDOMTestInterfacePrivate {
 #if ENABLE(Condition1) || ENABLE(Condition2)
@@ -66,14 +66,14 @@ WebCore::TestInterface* core(WebKitDOMTestInterface* request)
 WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_DOM_TYPE_TEST_INTERFACE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(Condition1) || ENABLE(Condition2)
 
-G_DEFINE_TYPE(WebKitDOMTestInterface, webkit_dom_test_interface, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestInterface, webkit_dom_test_interface, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
@@ -290,7 +290,7 @@ static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* re
             "implements-node",
             "TestInterface:implements-node",
             "read-only WebKitDOMNode* TestInterface:implements-node",
-            WEBKIT_TYPE_DOM_NODE,
+            WEBKIT_DOM_TYPE_NODE,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -320,7 +320,7 @@ static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* re
             "supplemental-node",
             "TestInterface:supplemental-node",
             "read-only WebKitDOMNode* TestInterface:supplemental-node",
-            WEBKIT_TYPE_DOM_NODE,
+            WEBKIT_DOM_TYPE_NODE,
             WEBKIT_PARAM_READABLE));
 
 }
index 5312cb8..d625251 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_INTERFACE            (webkit_dom_test_interface_get_type())
-#define WEBKIT_DOM_TEST_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_INTERFACE, WebKitDOMTestInterface))
-#define WEBKIT_DOM_TEST_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_INTERFACE, WebKitDOMTestInterfaceClass)
-#define WEBKIT_DOM_IS_TEST_INTERFACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_INTERFACE))
-#define WEBKIT_DOM_IS_TEST_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_INTERFACE))
-#define WEBKIT_DOM_TEST_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_INTERFACE, WebKitDOMTestInterfaceClass))
+#define WEBKIT_DOM_TYPE_TEST_INTERFACE            (webkit_dom_test_interface_get_type())
+#define WEBKIT_DOM_TEST_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_INTERFACE, WebKitDOMTestInterface))
+#define WEBKIT_DOM_TEST_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_INTERFACE, WebKitDOMTestInterfaceClass)
+#define WEBKIT_DOM_IS_TEST_INTERFACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_INTERFACE))
+#define WEBKIT_DOM_IS_TEST_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_INTERFACE))
+#define WEBKIT_DOM_TEST_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_INTERFACE, WebKitDOMTestInterfaceClass))
 
 struct _WebKitDOMTestInterface {
     WebKitDOMObject parent_instance;
index ae160a3..21bb348 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerPrivate)
+#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerPrivate)
 
 typedef struct _WebKitDOMTestMediaQueryListListenerPrivate {
     RefPtr<WebCore::TestMediaQueryListListener> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* r
 WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_DOM_TYPE_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)
+G_DEFINE_TYPE(WebKitDOMTestMediaQueryListListener, webkit_dom_test_media_query_list_listener, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_media_query_list_listener_finalize(GObject* object)
 {
index e70425f..77c7f4b 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER            (webkit_dom_test_media_query_list_listener_get_type())
-#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListener))
-#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerClass)
-#define WEBKIT_DOM_IS_TEST_MEDIA_QUERY_LIST_LISTENER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER))
-#define WEBKIT_DOM_IS_TEST_MEDIA_QUERY_LIST_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER))
-#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerClass))
+#define WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER            (webkit_dom_test_media_query_list_listener_get_type())
+#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListener))
+#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerClass)
+#define WEBKIT_DOM_IS_TEST_MEDIA_QUERY_LIST_LISTENER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER))
+#define WEBKIT_DOM_IS_TEST_MEDIA_QUERY_LIST_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER))
+#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListenerClass))
 
 struct _WebKitDOMTestMediaQueryListListener {
     WebKitDOMObject parent_instance;
index 17e1190..0c4356d 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorPrivate)
+#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorPrivate)
 
 typedef struct _WebKitDOMTestNamedConstructorPrivate {
     RefPtr<WebCore::TestNamedConstructor> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request)
 WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestNamedConstructor, webkit_dom_test_named_constructor, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestNamedConstructor, webkit_dom_test_named_constructor, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_named_constructor_finalize(GObject* object)
 {
index 21beddb..5e4e96d 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR            (webkit_dom_test_named_constructor_get_type())
-#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructor))
-#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorClass)
-#define WEBKIT_DOM_IS_TEST_NAMED_CONSTRUCTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR))
-#define WEBKIT_DOM_IS_TEST_NAMED_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR))
-#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorClass))
+#define WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR            (webkit_dom_test_named_constructor_get_type())
+#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructor))
+#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorClass)
+#define WEBKIT_DOM_IS_TEST_NAMED_CONSTRUCTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR))
+#define WEBKIT_DOM_IS_TEST_NAMED_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR))
+#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructorClass))
 
 struct _WebKitDOMTestNamedConstructor {
     WebKitDOMObject parent_instance;
index 5f2ab47..27c6a0a 100644 (file)
@@ -51,7 +51,7 @@ WebCore::TestNode* core(WebKitDOMTestNode* request)
 WebKitDOMTestNode* wrapTestNode(WebCore::TestNode* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_NODE(g_object_new(WEBKIT_TYPE_DOM_TEST_NODE, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_NODE(g_object_new(WEBKIT_DOM_TYPE_TEST_NODE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -89,7 +89,7 @@ static void webkit_dom_event_target_init(WebKitDOMEventTargetIface* iface)
     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))
+G_DEFINE_TYPE_WITH_CODE(WebKitDOMTestNode, webkit_dom_test_node, WEBKIT_DOM_TYPE_NODE, G_IMPLEMENT_INTERFACE(WEBKIT_DOM_TYPE_EVENT_TARGET, webkit_dom_event_target_init))
 
 static void webkit_dom_test_node_class_init(WebKitDOMTestNodeClass* requestClass)
 {
index cce4a33..e1aebc6 100644 (file)
 
 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))
+#define WEBKIT_DOM_TYPE_TEST_NODE            (webkit_dom_test_node_get_type())
+#define WEBKIT_DOM_TEST_NODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_NODE, WebKitDOMTestNode))
+#define WEBKIT_DOM_TEST_NODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_NODE, WebKitDOMTestNodeClass)
+#define WEBKIT_DOM_IS_TEST_NODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_NODE))
+#define WEBKIT_DOM_IS_TEST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_NODE))
+#define WEBKIT_DOM_TEST_NODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_NODE, WebKitDOMTestNodeClass))
 
 struct _WebKitDOMTestNode {
     WebKitDOMNode parent_instance;
index 5fef265..3e7115d 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_NONDETERMINISTIC_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicPrivate)
+#define WEBKIT_DOM_TEST_NONDETERMINISTIC_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicPrivate)
 
 typedef struct _WebKitDOMTestNondeterministicPrivate {
     RefPtr<WebCore::TestNondeterministic> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestNondeterministic* core(WebKitDOMTestNondeterministic* request)
 WebKitDOMTestNondeterministic* wrapTestNondeterministic(WebCore::TestNondeterministic* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_NONDETERMINISTIC(g_object_new(WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_NONDETERMINISTIC(g_object_new(WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestNondeterministic, webkit_dom_test_nondeterministic, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestNondeterministic, webkit_dom_test_nondeterministic, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
index 1cd1474..e9f8231 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC            (webkit_dom_test_nondeterministic_get_type())
-#define WEBKIT_DOM_TEST_NONDETERMINISTIC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministic))
-#define WEBKIT_DOM_TEST_NONDETERMINISTIC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicClass)
-#define WEBKIT_DOM_IS_TEST_NONDETERMINISTIC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC))
-#define WEBKIT_DOM_IS_TEST_NONDETERMINISTIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC))
-#define WEBKIT_DOM_TEST_NONDETERMINISTIC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicClass))
+#define WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC            (webkit_dom_test_nondeterministic_get_type())
+#define WEBKIT_DOM_TEST_NONDETERMINISTIC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministic))
+#define WEBKIT_DOM_TEST_NONDETERMINISTIC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicClass)
+#define WEBKIT_DOM_IS_TEST_NONDETERMINISTIC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC))
+#define WEBKIT_DOM_IS_TEST_NONDETERMINISTIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC))
+#define WEBKIT_DOM_TEST_NONDETERMINISTIC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_NONDETERMINISTIC, WebKitDOMTestNondeterministicClass))
 
 struct _WebKitDOMTestNondeterministic {
     WebKitDOMObject parent_instance;
index c124bff..d6343eb 100644 (file)
@@ -41,7 +41,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_OBJ_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_OBJ, WebKitDOMTestObjPrivate)
+#define WEBKIT_DOM_TEST_OBJ_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_OBJ, WebKitDOMTestObjPrivate)
 
 typedef struct _WebKitDOMTestObjPrivate {
     RefPtr<WebCore::TestObj> coreObject;
@@ -68,12 +68,12 @@ WebCore::TestObj* core(WebKitDOMTestObj* request)
 WebKitDOMTestObj* wrapTestObj(WebCore::TestObj* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_DOM_TYPE_TEST_OBJ, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestObj, webkit_dom_test_obj, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestObj, webkit_dom_test_obj, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
@@ -625,7 +625,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "read-only-test-obj-attr",
             "TestObj:read-only-test-obj-attr",
             "read-only WebKitDOMTestObj* TestObj:read-only-test-obj-attr",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -715,7 +715,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "test-obj-attr",
             "TestObj:test-obj-attr",
             "read-only WebKitDOMTestObj* TestObj:test-obj-attr",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -725,7 +725,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "xml-obj-attr",
             "TestObj:xml-obj-attr",
             "read-only WebKitDOMTestObj* TestObj:xml-obj-attr",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -885,7 +885,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-execution-context-attribute",
             "TestObj:with-script-execution-context-attribute",
             "read-only WebKitDOMTestObj* TestObj:with-script-execution-context-attribute",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -895,7 +895,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-state-attribute-raises",
             "TestObj:with-script-state-attribute-raises",
             "read-only WebKitDOMTestObj* TestObj:with-script-state-attribute-raises",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -905,7 +905,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-execution-context-attribute-raises",
             "TestObj:with-script-execution-context-attribute-raises",
             "read-only WebKitDOMTestObj* TestObj:with-script-execution-context-attribute-raises",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -915,7 +915,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-execution-context-and-script-state-attribute",
             "TestObj:with-script-execution-context-and-script-state-attribute",
             "read-only WebKitDOMTestObj* TestObj:with-script-execution-context-and-script-state-attribute",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -925,7 +925,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-execution-context-and-script-state-attribute-raises",
             "TestObj:with-script-execution-context-and-script-state-attribute-raises",
             "read-only WebKitDOMTestObj* TestObj:with-script-execution-context-and-script-state-attribute-raises",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -935,7 +935,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-execution-context-and-script-state-with-spaces-attribute",
             "TestObj:with-script-execution-context-and-script-state-with-spaces-attribute",
             "read-only WebKitDOMTestObj* TestObj:with-script-execution-context-and-script-state-with-spaces-attribute",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -945,7 +945,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "with-script-arguments-and-call-stack-attribute",
             "TestObj:with-script-arguments-and-call-stack-attribute",
             "read-only WebKitDOMTestObj* TestObj:with-script-arguments-and-call-stack-attribute",
-            WEBKIT_TYPE_DOM_TEST_OBJ,
+            WEBKIT_DOM_TYPE_TEST_OBJ,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -985,7 +985,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "any-attribute",
             "TestObj:any-attribute",
             "read-only WebKitDOMany* TestObj:any-attribute",
-            WEBKIT_TYPE_DOM_ANY,
+            WEBKIT_DOM_TYPE_ANY,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -995,7 +995,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "content-document",
             "TestObj:content-document",
             "read-only WebKitDOMDocument* TestObj:content-document",
-            WEBKIT_TYPE_DOM_DOCUMENT,
+            WEBKIT_DOM_TYPE_DOCUMENT,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -1005,7 +1005,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "mutable-point",
             "TestObj:mutable-point",
             "read-only WebKitDOMSVGPoint* TestObj:mutable-point",
-            WEBKIT_TYPE_DOM_SVG_POINT,
+            WEBKIT_DOM_TYPE_SVG_POINT,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -1015,7 +1015,7 @@ static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
             "immutable-point",
             "TestObj:immutable-point",
             "read-only WebKitDOMSVGPoint* TestObj:immutable-point",
-            WEBKIT_TYPE_DOM_SVG_POINT,
+            WEBKIT_DOM_TYPE_SVG_POINT,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
index c5cf2ca..bf27afb 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_OBJ            (webkit_dom_test_obj_get_type())
-#define WEBKIT_DOM_TEST_OBJ(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_OBJ, WebKitDOMTestObj))
-#define WEBKIT_DOM_TEST_OBJ_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_OBJ, WebKitDOMTestObjClass)
-#define WEBKIT_DOM_IS_TEST_OBJ(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_OBJ))
-#define WEBKIT_DOM_IS_TEST_OBJ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_OBJ))
-#define WEBKIT_DOM_TEST_OBJ_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_OBJ, WebKitDOMTestObjClass))
+#define WEBKIT_DOM_TYPE_TEST_OBJ            (webkit_dom_test_obj_get_type())
+#define WEBKIT_DOM_TEST_OBJ(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_OBJ, WebKitDOMTestObj))
+#define WEBKIT_DOM_TEST_OBJ_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_OBJ, WebKitDOMTestObjClass)
+#define WEBKIT_DOM_IS_TEST_OBJ(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_OBJ))
+#define WEBKIT_DOM_IS_TEST_OBJ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_OBJ))
+#define WEBKIT_DOM_TEST_OBJ_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_OBJ, WebKitDOMTestObjClass))
 
 struct _WebKitDOMTestObj {
     WebKitDOMObject parent_instance;
index 0f572f2..11af389 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsPrivate)
+#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsPrivate)
 
 typedef struct _WebKitDOMTestOverloadedConstructorsPrivate {
     RefPtr<WebCore::TestOverloadedConstructors> coreObject;
@@ -59,12 +59,12 @@ WebCore::TestOverloadedConstructors* core(WebKitDOMTestOverloadedConstructors* r
 WebKitDOMTestOverloadedConstructors* wrapTestOverloadedConstructors(WebCore::TestOverloadedConstructors* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS(g_object_new(WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS(g_object_new(WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestOverloadedConstructors, webkit_dom_test_overloaded_constructors, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestOverloadedConstructors, webkit_dom_test_overloaded_constructors, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_test_overloaded_constructors_finalize(GObject* object)
 {
index dd06df4..220cd87 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS            (webkit_dom_test_overloaded_constructors_get_type())
-#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructors))
-#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsClass)
-#define WEBKIT_DOM_IS_TEST_OVERLOADED_CONSTRUCTORS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS))
-#define WEBKIT_DOM_IS_TEST_OVERLOADED_CONSTRUCTORS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS))
-#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsClass))
+#define WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS            (webkit_dom_test_overloaded_constructors_get_type())
+#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructors))
+#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsClass)
+#define WEBKIT_DOM_IS_TEST_OVERLOADED_CONSTRUCTORS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS))
+#define WEBKIT_DOM_IS_TEST_OVERLOADED_CONSTRUCTORS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS))
+#define WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_OVERLOADED_CONSTRUCTORS, WebKitDOMTestOverloadedConstructorsClass))
 
 struct _WebKitDOMTestOverloadedConstructors {
     WebKitDOMObject parent_instance;
index f3aa669..7ebae78 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfacePrivate)
+#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfacePrivate)
 
 typedef struct _WebKitDOMTestSerializedScriptValueInterfacePrivate {
 #if ENABLE(Condition1) || ENABLE(Condition2)
@@ -64,14 +64,14 @@ WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptV
 WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(Condition1) || ENABLE(Condition2)
 
-G_DEFINE_TYPE(WebKitDOMTestSerializedScriptValueInterface, webkit_dom_test_serialized_script_value_interface, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestSerializedScriptValueInterface, webkit_dom_test_serialized_script_value_interface, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
@@ -174,7 +174,7 @@ static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitD
             "value",
             "TestSerializedScriptValueInterface:value",
             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:value",
-            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE,
+            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -184,7 +184,7 @@ static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitD
             "readonly-value",
             "TestSerializedScriptValueInterface:readonly-value",
             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:readonly-value",
-            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE,
+            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -194,7 +194,7 @@ static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitD
             "cached-value",
             "TestSerializedScriptValueInterface:cached-value",
             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-value",
-            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE,
+            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
@@ -204,7 +204,7 @@ static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitD
             "cached-readonly-value",
             "TestSerializedScriptValueInterface:cached-readonly-value",
             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-readonly-value",
-            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE,
+            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
             WEBKIT_PARAM_READABLE));
 
 }
index f0ae8aa..d12b0eb 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE            (webkit_dom_test_serialized_script_value_interface_get_type())
-#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterface))
-#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfaceClass)
-#define WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE))
-#define WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE))
-#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfaceClass))
+#define WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE            (webkit_dom_test_serialized_script_value_interface_get_type())
+#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterface))
+#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfaceClass)
+#define WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE))
+#define WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE))
+#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterfaceClass))
 
 struct _WebKitDOMTestSerializedScriptValueInterface {
     WebKitDOMObject parent_instance;
index 159fa3f..31e466a 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_TEST_TYPEDEFS_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_TEST_TYPEDEFS, WebKitDOMTestTypedefsPrivate)
+#define WEBKIT_DOM_TEST_TYPEDEFS_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_TYPEDEFS, WebKitDOMTestTypedefsPrivate)
 
 typedef struct _WebKitDOMTestTypedefsPrivate {
     RefPtr<WebCore::TestTypedefs> coreObject;
@@ -63,12 +63,12 @@ WebCore::TestTypedefs* core(WebKitDOMTestTypedefs* request)
 WebKitDOMTestTypedefs* wrapTestTypedefs(WebCore::TestTypedefs* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_TEST_TYPEDEFS(g_object_new(WEBKIT_TYPE_DOM_TEST_TYPEDEFS, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_TYPEDEFS(g_object_new(WEBKIT_DOM_TYPE_TEST_TYPEDEFS, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMTestTypedefs, webkit_dom_test_typedefs, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestTypedefs, webkit_dom_test_typedefs, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
@@ -202,7 +202,7 @@ static void webkit_dom_test_typedefs_class_init(WebKitDOMTestTypedefsClass* requ
             "immutable-serialized-script-value",
             "TestTypedefs:immutable-serialized-script-value",
             "read-only WebKitDOMSerializedScriptValue* TestTypedefs:immutable-serialized-script-value",
-            WEBKIT_TYPE_DOM_SERIALIZED_SCRIPT_VALUE,
+            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
             WEBKIT_PARAM_READABLE));
 
     g_object_class_install_property(
index 93a6b49..9627a8b 100644 (file)
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_TEST_TYPEDEFS            (webkit_dom_test_typedefs_get_type())
-#define WEBKIT_DOM_TEST_TYPEDEFS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_TYPEDEFS, WebKitDOMTestTypedefs))
-#define WEBKIT_DOM_TEST_TYPEDEFS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_TEST_TYPEDEFS, WebKitDOMTestTypedefsClass)
-#define WEBKIT_DOM_IS_TEST_TYPEDEFS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_TYPEDEFS))
-#define WEBKIT_DOM_IS_TEST_TYPEDEFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_TEST_TYPEDEFS))
-#define WEBKIT_DOM_TEST_TYPEDEFS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_TEST_TYPEDEFS, WebKitDOMTestTypedefsClass))
+#define WEBKIT_DOM_TYPE_TEST_TYPEDEFS            (webkit_dom_test_typedefs_get_type())
+#define WEBKIT_DOM_TEST_TYPEDEFS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_TYPEDEFS, WebKitDOMTestTypedefs))
+#define WEBKIT_DOM_TEST_TYPEDEFS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_TEST_TYPEDEFS, WebKitDOMTestTypedefsClass)
+#define WEBKIT_DOM_IS_TEST_TYPEDEFS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_TYPEDEFS))
+#define WEBKIT_DOM_IS_TEST_TYPEDEFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_TYPEDEFS))
+#define WEBKIT_DOM_TEST_TYPEDEFS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_TYPEDEFS, WebKitDOMTestTypedefsClass))
 
 struct _WebKitDOMTestTypedefs {
     WebKitDOMObject parent_instance;
index 133fd7b..d520152 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_ATTRIBUTE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_ATTRIBUTE, WebKitDOMattributePrivate)
+#define WEBKIT_DOM_ATTRIBUTE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_ATTRIBUTE, WebKitDOMattributePrivate)
 
 typedef struct _WebKitDOMattributePrivate {
     RefPtr<WebCore::attribute> coreObject;
@@ -59,12 +59,12 @@ WebCore::attribute* core(WebKitDOMattribute* request)
 WebKitDOMattribute* wrapattribute(WebCore::attribute* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_ATTRIBUTE(g_object_new(WEBKIT_TYPE_DOM_ATTRIBUTE, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_ATTRIBUTE(g_object_new(WEBKIT_DOM_TYPE_ATTRIBUTE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMattribute, webkit_dom_attribute, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMattribute, webkit_dom_attribute, WEBKIT_DOM_TYPE_OBJECT)
 
 enum {
     PROP_0,
index 5ced087..410d647 100644 (file)
@@ -31,12 +31,12 @@ G_BEGIN_DECLS
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_ATTRIBUTE            (webkit_dom_attribute_get_type())
-#define WEBKIT_DOM_ATTRIBUTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_ATTRIBUTE, WebKitDOMattribute))
-#define WEBKIT_DOM_ATTRIBUTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_ATTRIBUTE, WebKitDOMattributeClass)
-#define WEBKIT_DOM_IS_ATTRIBUTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_ATTRIBUTE))
-#define WEBKIT_DOM_IS_ATTRIBUTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_ATTRIBUTE))
-#define WEBKIT_DOM_ATTRIBUTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_ATTRIBUTE, WebKitDOMattributeClass))
+#define WEBKIT_DOM_TYPE_ATTRIBUTE            (webkit_dom_attribute_get_type())
+#define WEBKIT_DOM_ATTRIBUTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_ATTRIBUTE, WebKitDOMattribute))
+#define WEBKIT_DOM_ATTRIBUTE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_ATTRIBUTE, WebKitDOMattributeClass)
+#define WEBKIT_DOM_IS_ATTRIBUTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_ATTRIBUTE))
+#define WEBKIT_DOM_IS_ATTRIBUTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_ATTRIBUTE))
+#define WEBKIT_DOM_ATTRIBUTE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_ATTRIBUTE, WebKitDOMattributeClass))
 
 struct _WebKitDOMattribute {
     WebKitDOMObject parent_instance;
index 1858084..ca41f12 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
 
-#define WEBKIT_DOM_READONLY_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_TYPE_DOM_READONLY, WebKitDOMreadonlyPrivate)
+#define WEBKIT_DOM_READONLY_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_READONLY, WebKitDOMreadonlyPrivate)
 
 typedef struct _WebKitDOMreadonlyPrivate {
     RefPtr<WebCore::readonly> coreObject;
@@ -59,12 +59,12 @@ WebCore::readonly* core(WebKitDOMreadonly* request)
 WebKitDOMreadonly* wrapreadonly(WebCore::readonly* coreObject)
 {
     ASSERT(coreObject);
-    return WEBKIT_DOM_READONLY(g_object_new(WEBKIT_TYPE_DOM_READONLY, "core-object", coreObject, NULL));
+    return WEBKIT_DOM_READONLY(g_object_new(WEBKIT_DOM_TYPE_READONLY, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
 
-G_DEFINE_TYPE(WebKitDOMreadonly, webkit_dom_readonly, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMreadonly, webkit_dom_readonly, WEBKIT_DOM_TYPE_OBJECT)
 
 static void webkit_dom_readonly_finalize(GObject* object)
 {
index 3f320fd..74286b8 100644 (file)
@@ -31,12 +31,12 @@ G_BEGIN_DECLS
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_DOM_READONLY            (webkit_dom_readonly_get_type())
-#define WEBKIT_DOM_READONLY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_READONLY, WebKitDOMreadonly))
-#define WEBKIT_DOM_READONLY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_TYPE_DOM_READONLY, WebKitDOMreadonlyClass)
-#define WEBKIT_DOM_IS_READONLY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_READONLY))
-#define WEBKIT_DOM_IS_READONLY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_TYPE_DOM_READONLY))
-#define WEBKIT_DOM_READONLY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_DOM_READONLY, WebKitDOMreadonlyClass))
+#define WEBKIT_DOM_TYPE_READONLY            (webkit_dom_readonly_get_type())
+#define WEBKIT_DOM_READONLY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_READONLY, WebKitDOMreadonly))
+#define WEBKIT_DOM_READONLY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_READONLY, WebKitDOMreadonlyClass)
+#define WEBKIT_DOM_IS_READONLY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_READONLY))
+#define WEBKIT_DOM_IS_READONLY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_READONLY))
+#define WEBKIT_DOM_READONLY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_READONLY, WebKitDOMreadonlyClass))
 
 struct _WebKitDOMreadonly {
     WebKitDOMObject parent_instance;
index d6bb539..030db2a 100644 (file)
@@ -1,3 +1,20 @@
+2014-06-24  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Some of DOM bindings macros are misnamed
+        https://bugs.webkit.org/show_bug.cgi?id=121543
+
+        Reviewed by Carlos Garcia Campos.
+
+        As we are using WebKitDOM as a namespace we should unify all type macros
+        to have WEBKIT_DOM_TYPE prefix instead of WEBKIT_TYPE_DOM. Also add
+        more exceptions to decamelize function in GObject bindings generator
+        to fix the names of bindings for BR, HR, UL, OL, DL and LI elements.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp:
+        * gtk/webkitdom.py:
+        (WebKitDOMDocGeneratorSections._dom_class_decamelize):
+        (WebKitDOMDocGeneratorSections.write_section):
+
 2014-06-24  Frédéric Wang  <fred.wang@free.fr>
 
         [EFL] Install Latin Modern Math on the bots
index f2cf531..9a97827 100644 (file)
@@ -43,7 +43,7 @@ static void webkitNodeFilterDOMNodeFilterIfaceInit(WebKitDOMNodeFilterIface* ifa
     iface->accept_node = webkitNodeFilterAcceptNode;
 }
 
-G_DEFINE_TYPE_WITH_CODE(WebKitNodeFilter, webkit_node_filter, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_DOM_NODE_FILTER, webkitNodeFilterDOMNodeFilterIfaceInit))
+G_DEFINE_TYPE_WITH_CODE(WebKitNodeFilter, webkit_node_filter, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(WEBKIT_DOM_TYPE_NODE_FILTER, webkitNodeFilterDOMNodeFilterIfaceInit))
 
 static void webkit_node_filter_init(WebKitNodeFilter*)
 {
index e0561c2..b447e89 100755 (executable)
@@ -105,6 +105,12 @@ class WebKitDOMDocGeneratorSections(WebKitDOMDocGenerator):
         retval = retval.replace('Web_Kit', 'WebKit')
         retval = retval.replace('X_Path', 'XPath')
         retval = retval.replace('HTMLI_Frame', 'HTML_IFrame')
+        retval = retval.replace('HTMLBR', 'HTML_BR')
+        retval = retval.replace('HTMLHR', 'HTML_HR')
+        retval = retval.replace('HTMLLI', 'HTML_LI')
+        retval = retval.replace('HTMLD', 'HTML_D')
+        retval = retval.replace('HTMLO', 'HTML_O')
+        retval = retval.replace('HTMLU', 'HTML_U')
 
         return retval
 
@@ -139,20 +145,14 @@ class WebKitDOMDocGeneratorSections(WebKitDOMDocGenerator):
             self.write('\n<SUBSECTION Standard>\n')
             self.write('%sClass\n' % class_name)
             dom_class = self._dom_class_decamelize(class_name).upper()
-            self.write('WEBKIT_TYPE_DOM_%s\n' % dom_class)
+            self.write('WEBKIT_DOM_TYPE_%s\n' % dom_class)
             self.write('WEBKIT_DOM_%s\n' % dom_class)
-            if is_object:
-                self.write('WEBKIT_IS_DOM_%s\n' % dom_class)
-            else:
-                self.write('WEBKIT_DOM_IS_%s\n' % dom_class)
+            self.write('WEBKIT_DOM_IS_%s\n' % dom_class)
             self.write('WEBKIT_DOM_%s_CLASS\n' % dom_class)
             if is_interface:
                 self.write('WEBKIT_DOM_%s_GET_IFACE\n' % dom_class)
             else:
-                if is_object:
-                    self.write('WEBKIT_IS_DOM_%s_CLASS\n' % dom_class)
-                else:
-                    self.write('WEBKIT_DOM_IS_%s_CLASS\n' % dom_class)
+                self.write('WEBKIT_DOM_IS_%s_CLASS\n' % dom_class)
                 self.write('WEBKIT_DOM_%s_GET_CLASS\n' % dom_class)
             self.write('\n<SUBSECTION Private>\n')
             if is_object: