<!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>[190199] 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/190199">190199</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-24 02:24:54 -0700 (Thu, 24 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Fix GObject DOM API breaks after <a href="http://trac.webkit.org/projects/webkit/changeset/190120">r190120</a>.
Source/WebCore:
EntityReference has been removed from the DOM spec. Generate an
empy GObject implementation to keep API and ABI
compatibility. also add a deprecated impementation for the methods
using WebKitEntityReference.
* PlatformGTK.cmake: Do not generate bindings for EntityReference.idl.
* bindings/gobject/WebKitDOMDeprecated.cpp:
(webkit_dom_entity_reference_init):
(webkit_dom_entity_reference_class_init):
(webkit_dom_node_iterator_get_expand_entity_references):
(webkit_dom_tree_walker_get_expand_entity_references):
(webkit_dom_document_create_entity_reference):
* bindings/gobject/WebKitDOMDeprecated.h:
* bindings/gobject/WebKitDOMDeprecated.symbols:
* bindings/scripts/CodeGeneratorGObject.pm:
(SkipFunction): Remove FIXME.
* dom/Document.idl: Do not generate createEntityReference for GObject.
* dom/EntityReference.idl: Do not generate empty files for GObject.
Tools:
Bring back code removed in <a href="http://trac.webkit.org/projects/webkit/changeset/169931">r169931</a> to handle documentation of
deleted classes.
* gtk/webkitdom.py:
(WebKitDOMDocGenerator):
(WebKitDOMDocGenerator.write_deleted_classes):
(WebKitDOMDocGenerator.generate):
(write_deleted_classes):
(WebKitDOMDocGeneratorSections._deleted_class):
(WebKitDOMDocGeneratorSections._deleted_class.in):
(WebKitDOMDocGeneratorSections.write_deleted_classes):
(WebKitDOMDocGeneratorSections.write_deleted_classes.with):</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="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedcpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedh">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedsymbols">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCoredomEntityReferenceidl">trunk/Source/WebCore/dom/EntityReference.idl</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 (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/ChangeLog 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-09-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix GObject DOM API breaks after r190120.
+
+ EntityReference has been removed from the DOM spec. Generate an
+ empy GObject implementation to keep API and ABI
+ compatibility. also add a deprecated impementation for the methods
+ using WebKitEntityReference.
+
+ * PlatformGTK.cmake: Do not generate bindings for EntityReference.idl.
+ * bindings/gobject/WebKitDOMDeprecated.cpp:
+ (webkit_dom_entity_reference_init):
+ (webkit_dom_entity_reference_class_init):
+ (webkit_dom_node_iterator_get_expand_entity_references):
+ (webkit_dom_tree_walker_get_expand_entity_references):
+ (webkit_dom_document_create_entity_reference):
+ * bindings/gobject/WebKitDOMDeprecated.h:
+ * bindings/gobject/WebKitDOMDeprecated.symbols:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (SkipFunction): Remove FIXME.
+ * dom/Document.idl: Do not generate createEntityReference for GObject.
+ * dom/EntityReference.idl: Do not generate empty files for GObject.
+
</ins><span class="cx"> 2015-09-24 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Add support for JS builtins constructor
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -583,7 +583,6 @@
</span><span class="cx"> dom/DocumentFragment.idl
</span><span class="cx"> dom/DocumentType.idl
</span><span class="cx"> dom/Element.idl
</span><del>- dom/EntityReference.idl
</del><span class="cx"> dom/Event.idl
</span><span class="cx"> dom/KeyboardEvent.idl
</span><span class="cx"> dom/MouseEvent.idl
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -127,3 +127,31 @@
</span><span class="cx"> RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(element->getElementsByClassNameForObjC(String::fromUTF8(className)));
</span><span class="cx"> return WebKit::kit(nodeList.get());
</span><span class="cx"> }
</span><ins>+
+G_DEFINE_TYPE(WebKitDOMEntityReference, webkit_dom_entity_reference, WEBKIT_DOM_TYPE_NODE)
+
+static void webkit_dom_entity_reference_init(WebKitDOMEntityReference*)
+{
+}
+
+static void webkit_dom_entity_reference_class_init(WebKitDOMEntityReferenceClass*)
+{
+}
+
+gboolean webkit_dom_node_iterator_get_expand_entity_references(WebKitDOMNodeIterator*)
+{
+ g_warning("%s: EntityReference has been removed from DOM spec, this function does nothing.", __func__);
+ return FALSE;
+}
+
+gboolean webkit_dom_tree_walker_get_expand_entity_references(WebKitDOMTreeWalker*)
+{
+ g_warning("%s: EntityReference has been removed from DOM spec, this function does nothing.", __func__);
+ return FALSE;
+}
+
+WebKitDOMEntityReference* webkit_dom_document_create_entity_reference(WebKitDOMDocument*, const gchar*, GError**)
+{
+ g_warning("%s: EntityReference has been removed from DOM spec, this function does nothing.", __func__);
+ return nullptr;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #if !defined(WEBKIT_DISABLE_DEPRECATED)
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span><ins>+#include <webkitdom/WebKitDOMNode.h>
</ins><span class="cx"> #include <webkitdom/webkitdomdefines.h>
</span><span class="cx">
</span><span class="cx"> G_BEGIN_DECLS
</span><span class="lines">@@ -157,6 +158,64 @@
</span><span class="cx"> WEBKIT_DEPRECATED_FOR(webkit_dom_element_get_elements_by_class_name_as_html_collection) WebKitDOMNodeList*
</span><span class="cx"> webkit_dom_element_get_elements_by_class_name(WebKitDOMElement* self, const gchar* class_name);
</span><span class="cx">
</span><ins>+
+#define WEBKIT_DOM_TYPE_ENTITY_REFERENCE (webkit_dom_entity_reference_get_type())
+#define WEBKIT_DOM_ENTITY_REFERENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReference))
+#define WEBKIT_DOM_ENTITY_REFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReferenceClass)
+#define WEBKIT_DOM_IS_ENTITY_REFERENCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_ENTITY_REFERENCE))
+#define WEBKIT_DOM_IS_ENTITY_REFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_DOM_TYPE_ENTITY_REFERENCE))
+#define WEBKIT_DOM_ENTITY_REFERENCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReferenceClass))
+
+typedef struct _WebKitDOMEntityReference WebKitDOMEntityReference;
+typedef struct _WebKitDOMEntityReferenceClass WebKitDOMEntityReferenceClass;
+
+struct _WebKitDOMEntityReference {
+ WebKitDOMNode parent_instance;
+};
+
+struct _WebKitDOMEntityReferenceClass {
+ WebKitDOMNodeClass parent_class;
+};
+
+WEBKIT_DEPRECATED GType webkit_dom_entity_reference_get_type(void);
+
+/**
+ * webkit_dom_node_iterator_get_expand_entity_references:
+ * @self: A #WebKitDOMNodeIterator
+ *
+ * This function has been removed from the DOM spec and it just returns %FALSE.
+ *
+ * Returns: A #gboolean *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED gboolean webkit_dom_node_iterator_get_expand_entity_references(WebKitDOMNodeIterator* self);
+
+/**
+ * webkit_dom_tree_walker_get_expand_entity_references:
+ * @self: A #WebKitDOMTreeWalker
+ *
+ * This function has been removed from the DOM spec and it just returns %FALSE.
+ *
+ * Returns: A #gboolean
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED gboolean webkit_dom_tree_walker_get_expand_entity_references(WebKitDOMTreeWalker* self);
+
+/**
+ * webkit_dom_document_create_entity_reference:
+ * @self: A #WebKitDOMDocument
+ * @name: (allow-none): A #gchar
+ * @error: #GError
+ *
+ * This function has been removed from the DOM spec and it just returns %NULL.
+ *
+ * Returns: (transfer none): A #WebKitDOMEntityReference
+ *
+ * Deprecated: 2.12
+ */
+WEBKIT_DEPRECATED WebKitDOMEntityReference* webkit_dom_document_create_entity_reference(WebKitDOMDocument* self, const gchar* name, GError** error);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif /* WEBKIT_DISABLE_DEPRECATED */
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -9,3 +9,7 @@
</span><span class="cx"> WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name(WebKitDOMElement*, const gchar*)
</span><span class="cx"> WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name_ns(WebKitDOMElement*, const gchar*, const gchar*)
</span><span class="cx"> WebKitDOMNodeList* webkit_dom_element_get_elements_by_class_name(WebKitDOMElement*, const gchar*)
</span><ins>+GType webkit_dom_entity_reference_get_type(void)
+gboolean webkit_dom_tree_walker_get_expand_entity_references(WebKitDOMTreeWalker*)
+WebKitDOMEntityReference* webkit_dom_document_create_entity_reference(WebKitDOMDocument*, const gchar*, GError**)
+gboolean webkit_dom_node_iterator_get_expand_entity_references(WebKitDOMNodeIterator*)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -290,12 +290,6 @@
</span><span class="cx"> # Static methods are unsupported
</span><span class="cx"> return 1 if $function->isStatic;
</span><span class="cx">
</span><del>- # FIXME: This is skipped because I don't know how to fix the build any better way.
- # https://bugs.webkit.org/show_bug.cgi?id=149348
- if ($functionName eq "webkit_dom_document_create_entity_reference") {
- return 1;
- }
-
</del><span class="cx"> if (($isCustomFunction || $isUnsupportedCallWith) &&
</span><span class="cx"> $functionName ne "webkit_dom_node_replace_child" &&
</span><span class="cx"> $functionName ne "webkit_dom_node_insert_before" &&
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/dom/Document.idl 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> [Default=Undefined] optional DOMString data);
</span><span class="cx"> [NewObject, RaisesException] Attr createAttribute([Default=Undefined] optional DOMString name);
</span><span class="cx">
</span><del>-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
</del><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</ins><span class="cx"> [RaisesException] EntityReference createEntityReference([Default=Undefined] optional DOMString name);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEntityReferenceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EntityReference.idl (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EntityReference.idl 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Source/WebCore/dom/EntityReference.idl 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
</del><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</ins><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Tools/ChangeLog 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix GObject DOM API breaks after r190120.
+
+ Bring back code removed in r169931 to handle documentation of
+ deleted classes.
+
+ * gtk/webkitdom.py:
+ (WebKitDOMDocGenerator):
+ (WebKitDOMDocGenerator.write_deleted_classes):
+ (WebKitDOMDocGenerator.generate):
+ (write_deleted_classes):
+ (WebKitDOMDocGeneratorSections._deleted_class):
+ (WebKitDOMDocGeneratorSections._deleted_class.in):
+ (WebKitDOMDocGeneratorSections.write_deleted_classes):
+ (WebKitDOMDocGeneratorSections.write_deleted_classes.with):
+
</ins><span class="cx"> 2015-09-23 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] [Font Features] Implement font-variant-*
</span></span></pre></div>
<a id="trunkToolsgtkwebkitdompy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/webkitdom.py (190198 => 190199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/webkitdom.py 2015-09-24 09:18:15 UTC (rev 190198)
+++ trunk/Tools/gtk/webkitdom.py 2015-09-24 09:24:54 UTC (rev 190199)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> class WebKitDOMDocGenerator(object):
</span><span class="cx">
</span><ins>+ DELETED_CLASSES = ["WebKitDOMEntityReference"]
+
</ins><span class="cx"> def __init__(self, symbol_files, file_handle):
</span><span class="cx"> self._symbol_files = symbol_files
</span><span class="cx"> self._file_handle = file_handle
</span><span class="lines">@@ -37,6 +39,9 @@
</span><span class="cx"> def write_section(self, symbol_file):
</span><span class="cx"> raise NotImplementedError
</span><span class="cx">
</span><ins>+ def write_deleted_classes(self):
+ raise NotImplementedError
+
</ins><span class="cx"> def write_footer(self):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -53,6 +58,7 @@
</span><span class="cx"> if WebKitDOMDocGenerator.is_deprecated_symbol_file(symbol_file):
</span><span class="cx"> continue
</span><span class="cx"> self.write_section(symbol_file)
</span><ins>+ self.write_deleted_classes()
</ins><span class="cx"> self.write_footer()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -77,6 +83,10 @@
</span><span class="cx"> basename = os.path.basename(symbol_file)
</span><span class="cx"> self.write(' <xi:include href="xml/%s"/>\n' % basename.replace(".symbols", ".xml"))
</span><span class="cx">
</span><ins>+ def write_deleted_classes(self):
+ for class_name in self.DELETED_CLASSES:
+ self.write(' <xi:include href="xml/%s.xml"/>\n' % class_name)
+
</ins><span class="cx"> def write_footer(self):
</span><span class="cx"> self.write(''' </chapter>
</span><span class="cx">
</span><span class="lines">@@ -129,6 +139,13 @@
</span><span class="cx">
</span><span class="cx"> return retval
</span><span class="cx">
</span><ins>+ def _deleted_class(self, function):
+ for deleted_class in self.DELETED_CLASSES:
+ decamelized = 'webkit_dom_%s' % self._dom_class_decamelize(deleted_class).lower()
+ if function.startswith(decamelized):
+ return deleted_class
+ return None
+
</ins><span class="cx"> def _find_deprecated_symbols(self, symbol_file):
</span><span class="cx"> retval = {}
</span><span class="cx"> f = open(symbol_file, 'r')
</span><span class="lines">@@ -199,6 +216,27 @@
</span><span class="cx"> self.write('webkit_dom_%s_get_type\n' % dom_class.lower())
</span><span class="cx"> self.write('</SECTION>\n\n')
</span><span class="cx">
</span><ins>+ def write_deleted_classes(self):
+ for class_name in self.DELETED_CLASSES:
+ self.write('<SECTION>\n')
+ self.write('<FILE>%s</FILE>\n<TITLE>%s</TITLE>\n' % (class_name, class_name))
+ try:
+ self.write('\n'.join([name for name in self._deprecated_symbols[class_name] if not name.endswith('get_type')]) + '\n')
+ except KeyError:
+ # A deleted class with no public methods doesn't have deprecated symbols.
+ pass
+ self.write('\n<SUBSECTION Standard>\n')
+ 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)
+ self.write('WEBKIT_DOM_IS_%s\n' % dom_class)
+ self.write('WEBKIT_DOM_%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')
+ self.write('webkit_dom_%s_get_type\n' % self._dom_class_decamelize(class_name).lower())
+ self.write('</SECTION>\n\n')
+
</ins><span class="cx"> def write_footer(self):
</span><span class="cx"> self.write('<SECTION>\n')
</span><span class="cx"> self.write('<FILE>webkitdomdefines</FILE>\n<TITLE>WebKitDOMDefines</TITLE>\n')
</span></span></pre>
</div>
</div>
</body>
</html>