Changeset 188854 in webkit

Timestamp:

Aug 24, 2015 3:19:39 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK+ build after r188809.

document.getElementsByTagName returns an HTMLCollection since
r188809. So, rename it as
webkit_dom_document_get_elements_by_tag_name_as_html_collection,
and deprecate the old methods returning a NodeList.

• bindings/gobject/WebKitDOMDeprecated.cpp:

(webkit_dom_document_get_elements_by_tag_name): Use the
implementation returning a NodeList.
(webkit_dom_document_get_elements_by_tag_name_ns): Ditto.

• bindings/gobject/WebKitDOMDeprecated.h:
• bindings/gobject/WebKitDOMDeprecated.symbols: Add new symbols.
• bindings/gobject/webkitdom.symbols: Ditto.
• bindings/scripts/CodeGeneratorGObject.pm:

(GetEffectiveFunctionName): Bring back this method, now that we
have deprecated API again and add the checks for
getElementsByTagName methods.
(GenerateFunction): Use GetEffectiveFunctionName().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/gobject/WebKitDOMDeprecated.cpp (modified) (2 diffs)
• bindings/gobject/WebKitDOMDeprecated.h (modified) (1 diff)
• bindings/gobject/WebKitDOMDeprecated.symbols (modified) (1 diff)
• bindings/gobject/webkitdom.symbols (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ build after r188809.
+
+        document.getElementsByTagName returns an HTMLCollection since
+        r188809. So, rename it as
+        webkit_dom_document_get_elements_by_tag_name_as_html_collection,
+        and deprecate the old methods returning a NodeList.
+
+        * bindings/gobject/WebKitDOMDeprecated.cpp:
+        (webkit_dom_document_get_elements_by_tag_name): Use the
+        implementation returning a NodeList.
+        (webkit_dom_document_get_elements_by_tag_name_ns): Ditto.
+        * bindings/gobject/WebKitDOMDeprecated.h:
+        * bindings/gobject/WebKitDOMDeprecated.symbols: Add new symbols.
+        * bindings/gobject/webkitdom.symbols: Ditto.
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GetEffectiveFunctionName): Bring back this method, now that we
+        have deprecated API again and add the checks for
+        getElementsByTagName methods.
+        (GenerateFunction): Use GetEffectiveFunctionName().
+
 2015-08-24  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp

@@ -20 +20 @@
 #include "WebKitDOMDeprecated.h"
 
+#include "Document.h"
+#include "JSMainThreadExecState.h"
+#include "WebKitDOMDocumentPrivate.h"
 #include "WebKitDOMHTMLElement.h"
+#include "WebKitDOMNodeListPrivate.h"
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
 
 gchar* webkit_dom_html_element_get_inner_html(WebKitDOMHTMLElement* self)
@@ -51 +58 @@
     return webkit_dom_element_get_children(WEBKIT_DOM_ELEMENT(self));
 }
+
+WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name(WebKitDOMDocument* self, const gchar* tagName)
+{
+    g_return_val_if_fail(WEBKIT_DOM_IS_DOCUMENT(self), nullptr);
+    g_return_val_if_fail(tagName, nullptr);
+
+    WebCore::JSMainThreadNullState state;
+    WebCore::Document* document = WebKit::core(self);
+    RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(document->getElementsByTagNameForObjC(String::fromUTF8(tagName)));
+    return WebKit::kit(nodeList.get());
+}
+
+WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name_ns(WebKitDOMDocument* self, const gchar* namespaceURI, const gchar* tagName)
+{
+    g_return_val_if_fail(WEBKIT_DOM_IS_DOCUMENT(self), nullptr);
+    g_return_val_if_fail(namespaceURI, nullptr);
+    g_return_val_if_fail(tagName, nullptr);
+
+    WebCore::JSMainThreadNullState state;
+    WebCore::Document* document = WebKit::core(self);
+    RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(document->getElementsByTagNameNSForObjC(String::fromUTF8(namespaceURI), String::fromUTF8(tagName)));
+    return WebKit::kit(nodeList.get());
+}

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h

@@ -82 +82 @@
 webkit_dom_html_element_get_children(WebKitDOMHTMLElement* self);
 
+/**
+ * webkit_dom_document_get_elements_by_tag_name:
+ * @self: A #WebKitDOMDocument
+ * @tag_name: a #gchar with the tag name
+ *
+ * Returns: (transfer full): a #WebKitDOMNodeList
+ *
+ * Deprecated: 2.12: Use webkit_dom_document_get_elements_by_tag_name_as_html_collection() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_document_get_elements_by_tag_name_as_html_collection) WebKitDOMNodeList*
+webkit_dom_document_get_elements_by_tag_name(WebKitDOMDocument* self, const gchar* tag_name);
+
+/**
+ * webkit_dom_document_get_elements_by_tag_name_ns:
+ * @self: A #WebKitDOMDocument
+ * @namespace_uri: a #gchar with the namespace URI
+ * @tag_name: a #gchar with the tag name
+ *
+ * Returns: (transfer full): a #WebKitDOMNodeList
+ *
+ * Deprecated: 2.12: Use webkit_dom_document_get_elements_by_tag_name_ns_as_html_collection() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_document_get_elements_by_tag_name_as_html_collection) WebKitDOMNodeList*
+webkit_dom_document_get_elements_by_tag_name_ns(WebKitDOMDocument* self, const gchar* namespace_uri, const gchar* tag_name);
+
 G_END_DECLS
 

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols

@@ -4 +4 @@
 void webkit_dom_html_element_set_outer_html(WebKitDOMHTMLElement*, const gchar*, GError**)
 WebKitDOMHTMLCollection* webkit_dom_html_element_get_children(WebKitDOMHTMLElement*)
+WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name(WebKitDOMDocument*, const gchar*)
+WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name_ns(WebKitDOMDocument*, const gchar*, const gchar*)

trunk/Source/WebCore/bindings/gobject/webkitdom.symbols

@@ -86 +86 @@
 WebKitDOMNodeList* webkit_dom_document_get_elements_by_name(WebKitDOMDocument*, const gchar*)
 WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name(WebKitDOMDocument*, const gchar*)
+WebKitDOMHTMLCollection* webkit_dom_document_get_elements_by_tag_name_as_html_collection(WebKitDOMDocument*, const gchar*)@2.12
 WebKitDOMNodeList* webkit_dom_document_get_elements_by_tag_name_ns(WebKitDOMDocument*, const gchar*, const gchar*)
+WebKitDOMHTMLCollection* webkit_dom_document_get_elements_by_tag_name_ns_as_html_collection(WebKitDOMDocument*, const gchar*, const gchar*)@2.12
 WebKitDOMNodeList* webkit_dom_document_get_elements_by_class_name(WebKitDOMDocument*, const gchar*)
 WebKitDOMElement* webkit_dom_document_element_from_point(WebKitDOMDocument*, glong, glong)

trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -994 +994 @@
 }
 
+sub GetEffectiveFunctionName {
+    my $functionName = shift;
+
+    # Rename webkit_dom_document_get_elements_by_tag_name* functions since they were changed to return a
+    # WebKitDOMHTMLCollection instead of a WebKitDOMNodeList in r188809. The old methods are now manually
+    # added as deprecated.
+    if ($functionName eq "webkit_dom_document_get_elements_by_tag_name" || $functionName eq "webkit_dom_document_get_elements_by_tag_name_ns") {
+        return $functionName . "_as_html_collection";
+    }
+
+    return $functionName;
+}
+
 sub GenerateFunction {
     my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
@@ -1005 +1018 @@
     my $functionSigType = $prefix eq "set_" ? "void" : $function->signature->type;
     my $functionSigName = GetFunctionSignatureName($interfaceName, $function);
-    my $functionName = "webkit_dom_" . $decamelize . "_" . $prefix . $functionSigName;
+    my $functionName = GetEffectiveFunctionName("webkit_dom_" . $decamelize . "_" . $prefix . $functionSigName);
     my $returnType = GetGlibTypeName($functionSigType);
     my $returnValueIsGDOMType = IsGDOMClassType($functionSigType);