Diff
Modified: trunk/Source/WebCore/ChangeLog (170700 => 170701)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 07:09:26 UTC (rev 170701)
@@ -1,3 +1,18 @@
+2014-07-02 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
[GTK] XPathNSResolver should be exposed as an interface instead of as a class
Modified: trunk/Source/WebCore/PlatformGTK.cmake (170700 => 170701)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-07-02 07:09:26 UTC (rev 170701)
@@ -688,16 +688,19 @@
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
)
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
)
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
)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h (170700 => 170701)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h 2014-07-02 07:09:26 UTC (rev 170701)
@@ -30,8 +30,6 @@
#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 {
GTypeInterface gIface;
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h (170700 => 170701)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h 2014-07-02 07:09:26 UTC (rev 170701)
@@ -179,8 +179,6 @@
*/
#define WEBKIT_DOM_NODE_FILTER_SHOW_NOTATION 0x00000800
-typedef struct _WebKitDOMNodeFilterIface WebKitDOMNodeFilterIface;
-
struct _WebKitDOMNodeFilterIface {
GTypeInterface gIface;
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h (170700 => 170701)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h 2014-07-02 07:09:26 UTC (rev 170701)
@@ -30,8 +30,6 @@
#define WEBKIT_DOM_IS_XPATH_NS_RESOLVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_DOM_TYPE_XPATH_NS_RESOLVER))
#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;
Modified: trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl (170700 => 170701)
--- trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl 2014-07-02 07:09:26 UTC (rev 170701)
@@ -82,8 +82,12 @@
print "#endif\n";
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";
print "\n";
}
Modified: trunk/Tools/ChangeLog (170700 => 170701)
--- trunk/Tools/ChangeLog 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Tools/ChangeLog 2014-07-02 07:09:26 UTC (rev 170701)
@@ -1,3 +1,15 @@
+2014-07-02 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
[GTK] XPathNSResolver should be exposed as an interface instead of as a class
Modified: trunk/Tools/gtk/webkitdom.py (170700 => 170701)
--- trunk/Tools/gtk/webkitdom.py 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Tools/gtk/webkitdom.py 2014-07-02 07:09:26 UTC (rev 170701)
@@ -143,7 +143,10 @@
self.write('\n'.join(self._symbol_list(symbol_file)) + '\n')
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)
self.write('WEBKIT_DOM_%s\n' % dom_class)
