Changeset 170701 in webkit

Timestamp:

Jul 2, 2014, 12:09:26 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Do not add forward declaration of class struct for interfaces
​https://bugs.webkit.org/show_bug.cgi?id=134297

Reviewed by Martin Robinson.

Source/WebCore:

• PlatformGTK.cmake: Make files generated by

gobject-generate-headers.pl script depend on it.

• bindings/gobject/WebKitDOMEventTarget.h: Remove forward declaration.
• bindings/gobject/WebKitDOMNodeFilter.h: Ditto
• bindings/gobject/WebKitDOMXPathNSResolver.h: Ditto.
• bindings/scripts/gobject-generate-headers.pl: Use Iface instead

of Class suffix for interfaces.

Tools:
Add Iface symbol to documentation instead of Class for interfaces.

• gtk/webkitdom.py:

(WebKitDOMDocGeneratorSections.write_section):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformGTK.cmake (modified) (3 diffs)
• Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h (modified) (1 diff)
• Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h (modified) (1 diff)
• Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h (modified) (1 diff)
• Source/WebCore/bindings/scripts/gobject-generate-headers.pl (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/webkitdom.py (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Do not add forward declaration of class struct for interfaces
+        https://bugs.webkit.org/show_bug.cgi?id=134297
+
+        Reviewed by Martin Robinson.
+
+        * PlatformGTK.cmake: Make files generated by
+        gobject-generate-headers.pl script depend on it.
+        * bindings/gobject/WebKitDOMEventTarget.h: Remove forward declaration.
+        * bindings/gobject/WebKitDOMNodeFilter.h: Ditto
+        * bindings/gobject/WebKitDOMXPathNSResolver.h: Ditto.
+        * bindings/scripts/gobject-generate-headers.pl: Use Iface instead
+        of Class suffix for interfaces.
+
 2014-07-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -689 +689 @@
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+    DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
     COMMAND echo ${GObjectDOMBindingsStable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl defines > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
 )
@@ -694 +695 @@
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines-unstable.h
+    DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
     COMMAND echo ${GObjectDOMBindingsUnstable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl defines-unstable > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines-unstable.h
 )
@@ -699 +701 @@
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+    DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
     COMMAND echo ${GObjectDOMBindingsStable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl gdom > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
 )

trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h

@@ -30 +30 @@
 #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;
 
 struct _WebKitDOMEventTargetIface {

trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h

@@ -180 +180 @@
 #define WEBKIT_DOM_NODE_FILTER_SHOW_NOTATION               0x00000800
 
-typedef struct _WebKitDOMNodeFilterIface WebKitDOMNodeFilterIface;
-
 struct _WebKitDOMNodeFilterIface {
     GTypeInterface gIface;

trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h

@@ -31 +31 @@
 #define WEBKIT_DOM_XPATH_NS_RESOLVER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_DOM_TYPE_XPATH_NS_RESOLVER, WebKitDOMXPathNSResolverIface))
 
-typedef struct _WebKitDOMXPathNSResolverIface WebKitDOMXPathNSResolverIface;
-
 struct _WebKitDOMXPathNSResolverIface {
     GTypeInterface gIface;

trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl

@@ -83 +83 @@
 
     foreach my $class (@classes) {
-        if ($class ne "Deprecated" && $class ne "Custom") {
+        if ($class eq "EventTarget" || $class eq "NodeFilter" || $class eq "XPathNSResolver") {
+            print "typedef struct _WebKitDOM${class} WebKitDOM${class};\n";
+            print "typedef struct _WebKitDOM${class}Iface WebKitDOM${class}Iface;\n";
+            print "\n";
+        } elsif ($class ne "Deprecated" && $class ne "Custom") {
             print "typedef struct _WebKitDOM${class} WebKitDOM${class};\n";
             print "typedef struct _WebKitDOM${class}Class WebKitDOM${class}Class;\n";

trunk/Tools/ChangeLog

@@ +1 @@
+2014-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Do not add forward declaration of class struct for interfaces
+        https://bugs.webkit.org/show_bug.cgi?id=134297
+
+        Reviewed by Martin Robinson.
+
+        Add Iface symbol to documentation instead of Class for interfaces.
+
+        * gtk/webkitdom.py:
+        (WebKitDOMDocGeneratorSections.write_section):
+
 2014-07-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/gtk/webkitdom.py

@@ -144 +144 @@
         if not is_custom:
             self.write('\n<SUBSECTION Standard>\n')
-            self.write('%sClass\n' % class_name)
+            if is_interface:
+                self.write('%sIface\n' % class_name)
+            else:
+                self.write('%sClass\n' % class_name)
             dom_class = self._dom_class_decamelize(class_name).upper()
             self.write('WEBKIT_DOM_TYPE_%s\n' % dom_class)