Changeset 49191 in webkit

Timestamp:

Oct 6, 2009 10:15:22 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-06 Anton Muhin <antonm@chromium>

Reviewed by Dimitri Glazkov.

Non standard, but popular exetension allows automagically
turn a function into a namespace resolver. Support that in
Chromium as well.

This adds new layout tests.
​https://bugs.webkit.org/show_bug.cgi?id=30128

• fast/xpath/xpath-namespaces-expected.txt:
• fast/xpath/xpath-namespaces.html:

2009-10-06 Anton Muhin <antonm@chromium>

Reviewed by Dimitri Glazkov.

Non standard, but popular exetension allows automagically
turn a function into a namespace resolver. Support that in
Chromium as well.

Adjust CodeGeneratorV8 to treat XPathNSResolver in a special way.
​https://bugs.webkit.org/show_bug.cgi?id=30128

• bindings/scripts/CodeGeneratorV8.pm:
• bindings/v8/V8DOMWrapper.h: (WebCore::V8DOMWrapper::getXPathNSResolver):
• bindings/v8/custom/V8DocumentCustom.cpp: (WebCore::CALLBACK_FUNC_DECL):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/xpath/xpath-namespaces-expected.txt (modified) (1 diff)
• LayoutTests/fast/xpath/xpath-namespaces.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (4 diffs)
• WebCore/bindings/v8/V8DOMWrapper.h (modified) (2 diffs)
• WebCore/bindings/v8/custom/V8DocumentCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-06  Anton Muhin  <antonm@chromium>
+
+        Reviewed by Dimitri Glazkov.
+
+        Non standard, but popular exetension allows automagically
+        turn a function into a namespace resolver.  Support that in
+        Chromium as well.
+
+        This adds new layout tests.
+        https://bugs.webkit.org/show_bug.cgi?id=30128
+
+        * fast/xpath/xpath-namespaces-expected.txt:
+        * fast/xpath/xpath-namespaces.html:
+
 2009-10-06  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/LayoutTests/fast/xpath/xpath-namespaces-expected.txt

@@ -4 +4 @@
 PASS /ns:*
 PASS /foo:*
+PASS /xmpl:*
+PASS /xmpl:*
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/xpath/xpath-namespaces.html

@@ -27 +27 @@
     checkSnapshot("/foo:*", result, []);
 
+    // Now try a resolver originating from the function
+    var namespaces = { xmpl: "http://www.example.org" };
+    var mapResolver = function(prefix) { return namespaces[prefix]; };
+
+    var expr = doc.createExpression("/xmpl:*", mapResolver);
+    var result = expr.evaluate(contextNode, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    checkSnapshot("/xmpl:*", result, [doc.documentElement]);
+
+    var evaluator = new XPathEvaluator();
+    var result = evaluator.evaluate("/xmpl:*", doc, mapResolver, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    checkSnapshot("/xmpl:*", result, [doc.documentElement]);
+
     var successfullyParsed = true;
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-06  Anton Muhin  <antonm@chromium>
+
+        Reviewed by Dimitri Glazkov.
+
+        Non standard, but popular exetension allows automagically
+        turn a function into a namespace resolver.  Support that in
+        Chromium as well.
+
+        Adjust CodeGeneratorV8 to treat XPathNSResolver in a special way.
+        https://bugs.webkit.org/show_bug.cgi?id=30128
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/V8DOMWrapper.h:
+        (WebCore::V8DOMWrapper::getXPathNSResolver):
+        * bindings/v8/custom/V8DocumentCustom.cpp:
+        (WebCore::CALLBACK_FUNC_DECL):
+
 2009-10-06  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -1464 +1464 @@
         }
 
-        if ($parameter->type eq "NodeFilter") {
+        if ($parameter->type eq "NodeFilter" || $parameter->type eq "XPathNSResolver") {
             $functionString .= "$paramName.get()";
         } else {
@@ -1746 +1746 @@
     return "RefPtr<NodeFilter>" if $type eq "NodeFilter";
 
+    # necessary as resolvers could be constructed on fly.
+    return "RefPtr<XPathNSResolver>" if $type eq "XPathNSResolver";
+
     return "RefPtr<${type}>" if IsRefPtrType($type) and not $isParameter;
 
@@ -1902 +1905 @@
     }
 
+    if ($type eq "XPathNSResolver") {
+        return "V8DOMWrapper::getXPathNSResolver($value)";
+    }
+
     AddIncludesForType($type);
     # $implIncludes{"$type.h"} = 1 unless AvoidInclusionOfType($type);
@@ -1953 +1960 @@
         else { $result .= ", "; }
         if (IsWrapperType($parameter->type)) {
-            my $type = $parameter->type;
-            my $header = GetV8HeaderName($type);
-            $implIncludes{$header} = 1;
-            $result .= "V8${type}::GetRawTemplate()";
+            if ($parameter->type eq "XPathNSResolver") {
+                # Special case for XPathNSResolver.  All other browsers accepts a callable,
+                # so, even though it's against IDL, accept objects here.
+                $result .= "v8::Handle<v8::FunctionTemplate>()";
+            } else {
+                my $type = $parameter->type;
+                my $header = GetV8HeaderName($type);
+                $implIncludes{$header} = 1;
+                $result .= "V8${type}::GetRawTemplate()";
+            }
         } else {
             $result .= "v8::Handle<v8::FunctionTemplate>()";

trunk/WebCore/bindings/v8/V8DOMWrapper.h

@@ -38 +38 @@
 #include "PlatformString.h" // for WebCore::String
 #include "V8CustomBinding.h"
+#include "V8CustomXPathNSResolver.h"
 #include "V8DOMMap.h"
 #include "V8Index.h"
 #include "V8Utilities.h"
+#include "V8XPathNSResolver.h"
+#include "XPathNSResolver.h"
 #include <v8.h>
 
@@ -240 +243 @@
 
 
+        // XPath-related utilities
+        static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value)
+        {
+            RefPtr<XPathNSResolver> resolver;
+            if (V8XPathNSResolver::HasInstance(value))
+                resolver = convertToNativeObject<XPathNSResolver>(V8ClassIndex::XPATHNSRESOLVER, v8::Handle<v8::Object>::Cast(value));
+            else if (value->IsObject())
+                resolver = V8CustomXPathNSResolver::create(value->ToObject());
+            return resolver;
+        }
+
         // DOMImplementation is a singleton and it is handled in a special
         // way. A wrapper is generated per document and stored in an

trunk/WebCore/bindings/v8/custom/V8DocumentCustom.cpp

@@ -62 +62 @@
         contextNode = V8DOMWrapper::convertDOMWrapperToNode<Node>(v8::Handle<v8::Object>::Cast(args[1]));
 
-    RefPtr<XPathNSResolver> resolver;
-    if (V8XPathNSResolver::HasInstance(args[2]))
-        resolver = V8DOMWrapper::convertToNativeObject<XPathNSResolver>(V8ClassIndex::XPATHNSRESOLVER, v8::Handle<v8::Object>::Cast(args[2]));
-    else if (args[2]->IsObject())
-        resolver = V8CustomXPathNSResolver::create(args[2]->ToObject());
-    else if (!args[2]->IsNull() && !args[2]->IsUndefined())
+    RefPtr<XPathNSResolver> resolver = V8DOMWrapper::getXPathNSResolver(args[2]);
+    if (!resolver && !args[2]->IsNull() && !args[2]->IsUndefined())
         return throwError(TYPE_MISMATCH_ERR);