<!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>[197025] trunk/Source/WebCore</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/197025">197025</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 03:13:58 -0800 (Wed, 24 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed. Fix GObject DOM bindings API break after <a href="http://trac.webkit.org/projects/webkit/changeset/196998">r196998</a>.

webkit_dom_node_clone_node can now raise exceptions, so rename it
as webkit_dom_node_clone_node_with_error and deprecate the old one
that calls the new one ignoring the error.

* bindings/gobject/WebKitDOMDeprecated.cpp:
(webkit_dom_node_clone_node):
* bindings/gobject/WebKitDOMDeprecated.h:
* bindings/gobject/WebKitDOMDeprecated.symbols:
* bindings/gobject/webkitdom.symbols:
* bindings/scripts/CodeGeneratorGObject.pm:
(FunctionUsedToNotRaiseException):
(GenerateFunction):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorebindingsgobjectwebkitdomsymbols">trunk/Source/WebCore/bindings/gobject/webkitdom.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/ChangeLog        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-02-24  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        Unreviewed. Fix GObject DOM bindings API break after r196998.
+
+        webkit_dom_node_clone_node can now raise exceptions, so rename it
+        as webkit_dom_node_clone_node_with_error and deprecate the old one
+        that calls the new one ignoring the error.
+
+        * bindings/gobject/WebKitDOMDeprecated.cpp:
+        (webkit_dom_node_clone_node):
+        * bindings/gobject/WebKitDOMDeprecated.h:
+        * bindings/gobject/WebKitDOMDeprecated.symbols:
+        * bindings/gobject/webkitdom.symbols:
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (FunctionUsedToNotRaiseException):
+        (GenerateFunction):
+
+2016-02-24  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
</ins><span class="cx">         REGRESSION(r195949): [GTK] Test /webkit2/WebKitWebView/insert/link is failing since r195949
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=153747
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -127,6 +127,11 @@
</span><span class="cx">     return WebKit::kit(nodeList.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode* self, gboolean deep)
+{
+    return webkit_dom_node_clone_node_with_error(self, deep, nullptr);
+}
+
</ins><span class="cx"> G_DEFINE_TYPE(WebKitDOMEntityReference, webkit_dom_entity_reference, WEBKIT_DOM_TYPE_NODE)
</span><span class="cx"> 
</span><span class="cx"> static void webkit_dom_entity_reference_init(WebKitDOMEntityReference*)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -159,7 +159,19 @@
</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>+/**
+ * webkit_dom_node_clone_node:
+ * @self: A #WebKitDOMNode
+ * @deep: A #gboolean
+ *
+ * Returns: (transfer none): A #WebKitDOMNode
+ *
+ * Deprecated: 2.14: Use webkit_dom_node_clone_node_with_error() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_node_clone_node_with_error) WebKitDOMNode*
+webkit_dom_node_clone_node(WebKitDOMNode* self, gboolean deep, GError** error);
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> #define WEBKIT_DOM_TYPE_ENTITY_REFERENCE            (webkit_dom_entity_reference_get_type())
</span><span class="cx"> #define WEBKIT_DOM_ENTITY_REFERENCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReference))
</span><span class="cx"> #define WEBKIT_DOM_ENTITY_REFERENCE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  WEBKIT_DOM_TYPE_ENTITY_REFERENCE, WebKitDOMEntityReferenceClass)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -20,3 +20,4 @@
</span><span class="cx"> void webkit_dom_html_base_font_element_set_color(WebKitDOMHTMLBaseFontElement*, const gchar*)
</span><span class="cx"> void webkit_dom_html_base_font_element_set_face(WebKitDOMHTMLBaseFontElement*, const gchar*)
</span><span class="cx"> void webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement*, glong)
</span><ins>+WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode*, gboolean)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectwebkitdomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -230,6 +230,7 @@
</span><span class="cx"> WebKitDOMNode* webkit_dom_node_remove_child(WebKitDOMNode*, WebKitDOMNode*, GError**)
</span><span class="cx"> WebKitDOMNode* webkit_dom_node_insert_before(WebKitDOMNode*, WebKitDOMNode*, WebKitDOMNode*, GError**)
</span><span class="cx"> WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode*, gboolean)
</span><ins>+WebKitDOMNode* webkit_dom_node_clone_node_with_error(WebKitDOMNode*, gboolean, GError**)@2.14
</ins><span class="cx"> gboolean webkit_dom_node_contains(WebKitDOMNode*, WebKitDOMNode*)
</span><span class="cx"> gboolean webkit_dom_node_is_default_namespace(WebKitDOMNode*, const gchar*)
</span><span class="cx"> gboolean webkit_dom_node_is_supported(WebKitDOMNode*, const gchar*, const gchar*)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (197024 => 197025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2016-02-24 10:41:11 UTC (rev 197024)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2016-02-24 11:13:58 UTC (rev 197025)
</span><span class="lines">@@ -1046,6 +1046,12 @@
</span><span class="cx">         || $functionName eq &quot;webkit_dom_range_to_string&quot;;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub FunctionUsedToNotRaiseException {
+    my $functionName = shift;
+
+    return $functionName eq &quot;webkit_dom_node_clone_node&quot;;
+}
+
</ins><span class="cx"> sub GenerateFunction {
</span><span class="cx">     my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
</span><span class="cx"> 
</span><span class="lines">@@ -1068,6 +1074,13 @@
</span><span class="cx">     # the API compatibility.
</span><span class="cx">     my $usedToRaiseException = FunctionUsedToRaiseException($functionName);
</span><span class="cx"> 
</span><ins>+    # If a method didn't raise an exception but was changed to raise exceptions, the API
+    # changes because we use a explicit GError parameter to handle the exceptions.
+    # In this case, we add _with_error suffix and the previous version simply ignores the error.
+    if (FunctionUsedToNotRaiseException($functionName)) {
+        $functionName = $functionName . &quot;_with_error&quot;;
+    }
+
</ins><span class="cx">     my $conditionalString = $codeGenerator-&gt;GenerateConditionalString($function-&gt;signature);
</span><span class="cx">     my $parentConditionalString = $codeGenerator-&gt;GenerateConditionalString($parentNode);
</span><span class="cx">     my @conditionalWarn = GenerateConditionalWarning($function-&gt;signature);
</span></span></pre>
</div>
</div>

</body>
</html>