Diff
Modified: trunk/Source/WebCore/ChangeLog (197024 => 197025)
--- 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)
@@ -1,5 +1,22 @@
2016-02-24 Carlos Garcia Campos <cgar...@igalia.com>
+ 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 <cgar...@igalia.com>
+
REGRESSION(r195949): [GTK] Test /webkit2/WebKitWebView/insert/link is failing since r195949
https://bugs.webkit.org/show_bug.cgi?id=153747
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (197024 => 197025)
--- 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)
@@ -127,6 +127,11 @@
return WebKit::kit(nodeList.get());
}
+WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode* self, gboolean deep)
+{
+ return webkit_dom_node_clone_node_with_error(self, deep, nullptr);
+}
+
G_DEFINE_TYPE(WebKitDOMEntityReference, webkit_dom_entity_reference, WEBKIT_DOM_TYPE_NODE)
static void webkit_dom_entity_reference_init(WebKitDOMEntityReference*)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (197024 => 197025)
--- 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)
@@ -159,7 +159,19 @@
WEBKIT_DEPRECATED_FOR(webkit_dom_element_get_elements_by_class_name_as_html_collection) WebKitDOMNodeList*
webkit_dom_element_get_elements_by_class_name(WebKitDOMElement* self, const gchar* class_name);
+/**
+ * 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);
+
#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)
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (197024 => 197025)
--- 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)
@@ -20,3 +20,4 @@
void webkit_dom_html_base_font_element_set_color(WebKitDOMHTMLBaseFontElement*, const gchar*)
void webkit_dom_html_base_font_element_set_face(WebKitDOMHTMLBaseFontElement*, const gchar*)
void webkit_dom_html_base_font_element_set_size(WebKitDOMHTMLBaseFontElement*, glong)
+WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode*, gboolean)
Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (197024 => 197025)
--- 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)
@@ -230,6 +230,7 @@
WebKitDOMNode* webkit_dom_node_remove_child(WebKitDOMNode*, WebKitDOMNode*, GError**)
WebKitDOMNode* webkit_dom_node_insert_before(WebKitDOMNode*, WebKitDOMNode*, WebKitDOMNode*, GError**)
WebKitDOMNode* webkit_dom_node_clone_node(WebKitDOMNode*, gboolean)
+WebKitDOMNode* webkit_dom_node_clone_node_with_error(WebKitDOMNode*, gboolean, GError**)@2.14
gboolean webkit_dom_node_contains(WebKitDOMNode*, WebKitDOMNode*)
gboolean webkit_dom_node_is_default_namespace(WebKitDOMNode*, const gchar*)
gboolean webkit_dom_node_is_supported(WebKitDOMNode*, const gchar*, const gchar*)
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (197024 => 197025)
--- 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)
@@ -1046,6 +1046,12 @@
|| $functionName eq "webkit_dom_range_to_string";
}
+sub FunctionUsedToNotRaiseException {
+ my $functionName = shift;
+
+ return $functionName eq "webkit_dom_node_clone_node";
+}
+
sub GenerateFunction {
my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
@@ -1068,6 +1074,13 @@
# the API compatibility.
my $usedToRaiseException = FunctionUsedToRaiseException($functionName);
+ # 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 . "_with_error";
+ }
+
my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
my $parentConditionalString = $codeGenerator->GenerateConditionalString($parentNode);
my @conditionalWarn = GenerateConditionalWarning($function->signature);
