<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170701] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170701">170701</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-02 00:09:26 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMEventTargeth">trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMNodeFilterh">trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMXPathNSResolverh">trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsgobjectgenerateheaderspl">trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkwebkitdompy">trunk/Tools/gtk/webkitdom.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-07-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] XPathNSResolver should be exposed as an interface instead of as a class
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -688,16 +688,19 @@
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
</span><ins>+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
</ins><span class="cx"> COMMAND echo ${GObjectDOMBindingsStable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl defines > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines-unstable.h
</span><ins>+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
</ins><span class="cx"> 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
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
</span><ins>+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl
</ins><span class="cx"> COMMAND echo ${GObjectDOMBindingsStable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl gdom > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMEventTargeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #define WEBKIT_DOM_IS_EVENT_TARGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET))
</span><span class="cx"> #define WEBKIT_DOM_EVENT_TARGET_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_DOM_TYPE_EVENT_TARGET, WebKitDOMEventTargetIface))
</span><span class="cx">
</span><del>-typedef struct _WebKitDOMEventTargetIface WebKitDOMEventTargetIface;
-
</del><span class="cx"> struct _WebKitDOMEventTargetIface {
</span><span class="cx"> GTypeInterface gIface;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMNodeFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMNodeFilter.h (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -179,8 +179,6 @@
</span><span class="cx"> */
</span><span class="cx"> #define WEBKIT_DOM_NODE_FILTER_SHOW_NOTATION 0x00000800
</span><span class="cx">
</span><del>-typedef struct _WebKitDOMNodeFilterIface WebKitDOMNodeFilterIface;
-
</del><span class="cx"> struct _WebKitDOMNodeFilterIface {
</span><span class="cx"> GTypeInterface gIface;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMXPathNSResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMXPathNSResolver.h (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #define WEBKIT_DOM_IS_XPATH_NS_RESOLVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_DOM_TYPE_XPATH_NS_RESOLVER))
</span><span class="cx"> #define WEBKIT_DOM_XPATH_NS_RESOLVER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WEBKIT_DOM_TYPE_XPATH_NS_RESOLVER, WebKitDOMXPathNSResolverIface))
</span><span class="cx">
</span><del>-typedef struct _WebKitDOMXPathNSResolverIface WebKitDOMXPathNSResolverIface;
-
</del><span class="cx"> struct _WebKitDOMXPathNSResolverIface {
</span><span class="cx"> GTypeInterface gIface;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsgobjectgenerateheaderspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -82,8 +82,12 @@
</span><span class="cx"> print "#endif\n";
</span><span class="cx">
</span><span class="cx"> foreach my $class (@classes) {
</span><del>- if ($class ne "Deprecated" && $class ne "Custom") {
</del><ins>+ if ($class eq "EventTarget" || $class eq "NodeFilter" || $class eq "XPathNSResolver") {
</ins><span class="cx"> print "typedef struct _WebKitDOM${class} WebKitDOM${class};\n";
</span><ins>+ 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";
</ins><span class="cx"> print "typedef struct _WebKitDOM${class}Class WebKitDOM${class}Class;\n";
</span><span class="cx"> print "\n";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-02 07:04:23 UTC (rev 170700)
+++ trunk/Tools/ChangeLog 2014-07-02 07:09:26 UTC (rev 170701)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-07-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] XPathNSResolver should be exposed as an interface instead of as a class
</span></span></pre></div>
<a id="trunkToolsgtkwebkitdompy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/webkitdom.py (170700 => 170701)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -143,7 +143,10 @@
</span><span class="cx"> self.write('\n'.join(self._symbol_list(symbol_file)) + '\n')
</span><span class="cx"> if not is_custom:
</span><span class="cx"> self.write('\n<SUBSECTION Standard>\n')
</span><del>- self.write('%sClass\n' % class_name)
</del><ins>+ if is_interface:
+ self.write('%sIface\n' % class_name)
+ else:
+ self.write('%sClass\n' % class_name)
</ins><span class="cx"> dom_class = self._dom_class_decamelize(class_name).upper()
</span><span class="cx"> self.write('WEBKIT_DOM_TYPE_%s\n' % dom_class)
</span><span class="cx"> self.write('WEBKIT_DOM_%s\n' % dom_class)
</span></span></pre>
</div>
</div>
</body>
</html>