Changeset 151267 in webkit

Timestamp:

Jun 6, 2013 6:39:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Parameters 'inResult' and 'resolver' from function 'webkit_dom_document_evaluate' should be allowed to be NULL
​https://bugs.webkit.org/show_bug.cgi?id=117129

Patch by Diego Pino Garcia <Diego Pino Garcia> on 2013-06-06
Reviewed by Xan Lopez.

Source/WebCore:

At this moment there was a temporary fix that allowed parameter
'inResult' to be NULL (see: webk.it/42115). However, there was no fix
for parameter 'resolver'.

This patch refactors the code of the previous fix, moving the code for
determine whether a parameter can be NULL or not to GetGReturnMacro.
The solution is quite general and will alow to add other parameters in
the future if needed.

• bindings/scripts/CodeGeneratorGObject.pm:

(GetGReturnMacro): Pass functionName, as in some cases the code
generated depends on the paramName and the functionName
(ParamCanBeNull): Checks if a parameter is allowed to be NULL
(GenerateFunction):

Source/WebKit/gtk:

Add test for function 'webkit_dom_document_evaluate'.

• tests/testdomdocument.c:

(test_dom_document_evaluate): Checks function dom_document_evaluate,
executes an XPath expression on a HTML document.
(main):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorGObject.pm (modified) (5 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/tests/testdomdocument.c (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-06  Diego Pino Garcia  <dpino@igalia.com>
+
+        [GTK] Parameters 'inResult' and 'resolver' from function 'webkit_dom_document_evaluate' should be allowed to be NULL
+        https://bugs.webkit.org/show_bug.cgi?id=117129
+
+        Reviewed by Xan Lopez.
+
+        At this moment there was a temporary fix that allowed parameter
+        'inResult' to be NULL (see: webk.it/42115). However, there was no fix
+        for parameter 'resolver'.
+        
+        This patch refactors the code of the previous fix, moving the code for
+        determine whether a parameter can be NULL or not to GetGReturnMacro.
+        The solution is quite general and will alow to add other parameters in
+        the future if needed. 
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GetGReturnMacro): Pass functionName, as in some cases the code
+        generated depends on the paramName and the functionName
+        (ParamCanBeNull): Checks if a parameter is allowed to be NULL 
+        (GenerateFunction):
+
 2013-06-06  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -46 +46 @@
                     "HTMLCollection" => 1);
 
+# List of function parameters that are allowed to be NULL
+my $canBeNullParams = {
+    'webkit_dom_document_evaluate' => ['inResult', 'resolver']
+};
+
 # Default constructor
 sub new {
@@ -846 +851 @@
 
 sub GetGReturnMacro {
-    my ($paramName, $paramIDLType, $returnType) = @_;
+    my ($paramName, $paramIDLType, $returnType, $functionName) = @_;
 
     my $condition;
@@ -854 +859 @@
         my $paramTypeCaps = uc(FixUpDecamelizedName(decamelize($paramIDLType)));
         $condition = "WEBKIT_DOM_IS_${paramTypeCaps}($paramName)";
+        if (ParamCanBeNull($functionName, $paramName)) {
+            $condition = "!$paramName || $condition";
+        }
     } else {
         $condition = "$paramName";
@@ -869 +877 @@
 }
 
+sub ParamCanBeNull {
+    my($functionName, $paramName) = @_;
+
+    if (defined($functionName)) {
+        return scalar(grep(/$paramName/, @{$canBeNullParams->{$functionName}}));
+    }
+    return 0;
+}
+
 sub GenerateFunction {
     my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
@@ -974 +991 @@
         my $paramIsGDOMType = IsGDOMClassType($paramIDLType);
         if (!$paramTypeIsPrimitive) {
-            # FIXME: Temporary hack for generating a proper implementation
-            #        of the webkit_dom_document_evaluate function (Bug-ID: 42115)
-            if (!(($functionName eq "webkit_dom_document_evaluate") && ($paramIDLType eq "XPathResult"))) {
-                $gReturnMacro = GetGReturnMacro($paramName, $paramIDLType, $returnType);
-                push(@cBody, $gReturnMacro);
-            }
+            $gReturnMacro = GetGReturnMacro($paramName, $paramIDLType, $returnType, $functionName);
+            push(@cBody, $gReturnMacro);
         }
     }

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-06-06  Diego Pino Garcia  <dpino@igalia.com>
+
+        [GTK] Parameters 'inResult' and 'resolver' from function 'webkit_dom_document_evaluate' should be allowed to be NULL
+        https://bugs.webkit.org/show_bug.cgi?id=117129
+
+        Reviewed by Xan Lopez.
+
+        Add test for function 'webkit_dom_document_evaluate'.
+
+        * tests/testdomdocument.c:
+        (test_dom_document_evaluate): Checks function dom_document_evaluate,
+        executes an XPath expression on a HTML document.
+        (main): 
+
 2013-06-05  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebKit/gtk/tests/testdomdocument.c

@@ -33 +33 @@
 #define HTML_DOCUMENT_IFRAME "<html><head><title>IFrame</title></head><body><iframe id='iframe'></iframe><div id='test'></div></body></html>"
 #define HTML_DOCUMENT_TABLE "<html><body><table id=\"table\"></table></body></html>"
+#define HTML_DOCUMENT_EVALUATE "<html><head><title></title></head><body><div>First div</div><div>Second div</div></body></html>"
 
 typedef struct {
@@ -207 +208 @@
     g_assert(WEBKIT_DOM_IS_HTML_COLLECTION(rows));
     g_assert_cmpint(webkit_dom_html_collection_get_length(rows), ==, 1);
+}
+
+static void test_dom_document_evaluate(DomDocumentFixture* fixture, gconstpointer data)
+{
+    g_assert(fixture);
+    WebKitWebView* view = (WebKitWebView*)fixture->webView;
+    g_assert(view);
+    WebKitDOMDocument* document = webkit_web_view_get_dom_document(view);
+    g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+    WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_tag_name(document, "html");
+    g_assert(list);
+    gulong length = webkit_dom_node_list_get_length(list);
+    g_assert_cmpint(length, ==, 1);
+    WebKitDOMNode* html = webkit_dom_node_list_item(list, 0);
+    g_assert(WEBKIT_DOM_IS_NODE(html));
+
+    WebKitDOMXPathResult* result = webkit_dom_document_evaluate(document, "//div", html, NULL, 0, NULL, NULL);
+    g_assert(WEBKIT_DOM_IS_XPATH_RESULT(result));
+
+    int i = 0;
+    WebKitDOMNode* node;
+    while ( (node = webkit_dom_xpath_result_iterate_next(result, NULL)) != NULL) {
+        g_assert(node);
+        WebKitDOMElement* element = (WebKitDOMElement*)node;
+        g_assert_cmpstr(webkit_dom_element_get_tag_name(element), ==, "DIV");
+        i++;
+    }
+    g_assert_cmpint(i, ==, 2);
+
+    g_object_unref(list);
 }
 
@@ -381 +412 @@
                dom_document_fixture_teardown);
 
+    g_test_add("/webkit/domdocument/test_document_evaluate",
+               DomDocumentFixture, HTML_DOCUMENT_EVALUATE,
+               dom_document_fixture_setup,
+               test_dom_document_evaluate,
+               dom_document_fixture_teardown);
+
     g_test_add("/webkit/domdocument/test_garbage_collection",
                DomDocumentFixture, HTML_DOCUMENT_LINKS,