Diff
Modified: trunk/Source/WebCore/ChangeLog (188856 => 188857)
--- trunk/Source/WebCore/ChangeLog 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/ChangeLog 2015-08-24 11:33:05 UTC (rev 188857)
@@ -1,5 +1,24 @@
2015-08-24 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix GObject DOM bindings API break test after r188809.
+
+ element.getElementsByTagName and element.getElementsByClassName
+ were also changed in r188809 to return an HTMLCollection. The
+ build didn't fail because we don't use those in our tests, but the
+ API breaks need to be fixed too.
+
+ * bindings/gobject/WebKitDOMDeprecated.cpp:
+ (webkit_dom_element_get_elements_by_tag_name):
+ (webkit_dom_element_get_elements_by_tag_name_ns):
+ (webkit_dom_element_get_elements_by_class_name):
+ * bindings/gobject/WebKitDOMDeprecated.h:
+ * bindings/gobject/WebKitDOMDeprecated.symbols:
+ * bindings/gobject/webkitdom.symbols:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GetEffectiveFunctionName):
+
+2015-08-24 Carlos Garcia Campos <[email protected]>
+
Unreviewed. Fix GObject DOM bindings API break test after r188735.
document.getElementsByClassName returns an HTMLCollection since
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (188856 => 188857)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-08-24 11:33:05 UTC (rev 188857)
@@ -20,8 +20,10 @@
#include "WebKitDOMDeprecated.h"
#include "Document.h"
+#include "Element.h"
#include "JSMainThreadExecState.h"
#include "WebKitDOMDocumentPrivate.h"
+#include "WebKitDOMElementPrivate.h"
#include "WebKitDOMHTMLElement.h"
#include "WebKitDOMNodeListPrivate.h"
#include <wtf/GetPtr.h>
@@ -91,3 +93,37 @@
RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(document->getElementsByClassNameForObjC(String::fromUTF8(className)));
return WebKit::kit(nodeList.get());
}
+
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name(WebKitDOMElement* self, const gchar* tagName)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_ELEMENT(self), nullptr);
+ g_return_val_if_fail(tagName, nullptr);
+
+ WebCore::JSMainThreadNullState state;
+ WebCore::Element* element = WebKit::core(self);
+ RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(element->getElementsByTagNameForObjC(String::fromUTF8(tagName)));
+ return WebKit::kit(nodeList.get());
+}
+
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name_ns(WebKitDOMElement* self, const gchar* namespaceURI, const gchar* tagName)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_ELEMENT(self), nullptr);
+ g_return_val_if_fail(namespaceURI, nullptr);
+ g_return_val_if_fail(tagName, nullptr);
+
+ WebCore::JSMainThreadNullState state;
+ WebCore::Element* element = WebKit::core(self);
+ RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(element->getElementsByTagNameNSForObjC(String::fromUTF8(namespaceURI), String::fromUTF8(tagName)));
+ return WebKit::kit(nodeList.get());
+}
+
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_class_name(WebKitDOMElement* self, const gchar* className)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_ELEMENT(self), nullptr);
+ g_return_val_if_fail(className, nullptr);
+
+ WebCore::JSMainThreadNullState state;
+ WebCore::Element* element = WebKit::core(self);
+ RefPtr<WebCore::NodeList> nodeList = WTF::getPtr(element->getElementsByClassNameForObjC(String::fromUTF8(className)));
+ return WebKit::kit(nodeList.get());
+}
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (188856 => 188857)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-08-24 11:33:05 UTC (rev 188857)
@@ -119,6 +119,44 @@
WEBKIT_DEPRECATED_FOR(webkit_dom_document_get_elements_by_class_name_as_html_collection) WebKitDOMNodeList*
webkit_dom_document_get_elements_by_class_name(WebKitDOMDocument* self, const gchar* class_name);
+/**
+ * webkit_dom_element_get_elements_by_tag_name:
+ * @self: A #WebKitDOMElement
+ * @tag_name: a #gchar with the tag name
+ *
+ * Returns: (transfer full): a #WebKitDOMNodeList
+ *
+ * Deprecated: 2.12: Use webkit_dom_element_get_elements_by_tag_name_as_html_collection() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_element_get_elements_by_tag_name_as_html_collection) WebKitDOMNodeList*
+webkit_dom_element_get_elements_by_tag_name(WebKitDOMElement* self, const gchar* tag_name);
+
+/**
+ * webkit_dom_element_get_elements_by_tag_name_ns:
+ * @self: A #WebKitDOMElement
+ * @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_element_get_elements_by_tag_name_ns_as_html_collection() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_element_get_elements_by_tag_name_as_html_collection) WebKitDOMNodeList*
+webkit_dom_element_get_elements_by_tag_name_ns(WebKitDOMElement* self, const gchar* namespace_uri, const gchar* tag_name);
+
+
+/**
+ * webkit_dom_element_get_elements_by_class_name:
+ * @self: A #WebKitDOMElement
+ * @class_name: a #gchar with the tag name
+ *
+ * Returns: (transfer full): a #WebKitDOMNodeList
+ *
+ * Deprecated: 2.12: Use webkit_dom_element_get_elements_by_class_name_as_html_collection() instead.
+ */
+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);
+
G_END_DECLS
#endif /* WEBKIT_DISABLE_DEPRECATED */
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (188856 => 188857)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2015-08-24 11:33:05 UTC (rev 188857)
@@ -6,3 +6,6 @@
WebKitDOMNodeList* webkit_dom_document_get_elements_by_class_name(WebKitDOMDocument*, const gchar*)
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*)
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name(WebKitDOMElement*, const gchar*)
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name_ns(WebKitDOMElement*, const gchar*, const gchar*)
+WebKitDOMNodeList* webkit_dom_element_get_elements_by_class_name(WebKitDOMElement*, const gchar*)
Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (188856 => 188857)
--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2015-08-24 11:33:05 UTC (rev 188857)
@@ -163,8 +163,11 @@
WebKitDOMElement* webkit_dom_element_query_selector(WebKitDOMElement*, const gchar*, GError**)
WebKitDOMNodeList* webkit_dom_element_query_selector_all(WebKitDOMElement*, const gchar*, GError**)
WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name(WebKitDOMElement*, const gchar*)
+WebKitDOMHTMLCollection* webkit_dom_element_get_elements_by_tag_name_as_html_collection(WebKitDOMElement*, const gchar*)@2.12
WebKitDOMNodeList* webkit_dom_element_get_elements_by_tag_name_ns(WebKitDOMElement*, const gchar*, const gchar*)
+WebKitDOMHTMLCollection* webkit_dom_element_get_elements_by_tag_name_ns_as_html_collection(WebKitDOMElement*, const gchar*, const gchar*)@2.12
WebKitDOMNodeList* webkit_dom_element_get_elements_by_class_name(WebKitDOMElement*, const gchar*)
+WebKitDOMHTMLCollection* webkit_dom_element_get_elements_by_class_name_as_html_collection(WebKitDOMElement*, const gchar*)@2.12
void webkit_dom_element_focus(WebKitDOMElement*)
void webkit_dom_element_blur(WebKitDOMElement*)
GType webkit_dom_entity_reference_get_type(void)
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (188856 => 188857)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-08-24 11:15:41 UTC (rev 188856)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-08-24 11:33:05 UTC (rev 188857)
@@ -996,12 +996,15 @@
sub GetEffectiveFunctionName {
my $functionName = shift;
- # Rename webkit_dom_document_get_elements_by_tag_name* and webkit_dom_document_get_elements_by_class_name
+ # Rename webkit_dom_[document|element]_get_elements_by_tag_name* and webkit_dom_[document|element]_get_elements_by_class_name
# functions since they were changed to return a WebKitDOMHTMLCollection instead of a WebKitDOMNodeList in
# r188809 and r188735. 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"
- || $functionName eq "webkit_dom_document_get_elements_by_class_name") {
+ || $functionName eq "webkit_dom_document_get_elements_by_class_name"
+ || $functionName eq "webkit_dom_element_get_elements_by_tag_name"
+ || $functionName eq "webkit_dom_element_get_elements_by_tag_name_ns"
+ || $functionName eq "webkit_dom_element_get_elements_by_class_name") {
return $functionName . "_as_html_collection";
}
