Changeset 100246 in webkit

Timestamp:

Nov 15, 2011 12:08:59 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: Command line $x fails for 3 of 4 types of XPath query
​https://bugs.webkit.org/show_bug.cgi?id=72276

Reviewed by Timothy Hatcher.

Source/WebCore:

Test: inspector/console/console-xpath.html

• inspector/InjectedScriptSource.js:

(.):

LayoutTests:

• inspector/console/console-xpath-expected.txt: Added.
• inspector/console/console-xpath.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/console-xpath-expected.txt (added)
• LayoutTests/inspector/console/console-xpath.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-14  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: Command line $x fails for 3 of 4 types of XPath query
+        https://bugs.webkit.org/show_bug.cgi?id=72276
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/console/console-xpath-expected.txt: Added.
+        * inspector/console/console-xpath.html: Added.
+
 2011-11-14  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-14  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: Command line $x fails for 3 of 4 types of XPath query
+        https://bugs.webkit.org/show_bug.cgi?id=72276
+
+        Reviewed by Timothy Hatcher.
+
+        Test: inspector/console/console-xpath.html
+
+        * inspector/InjectedScriptSource.js:
+        (.):
+
 2011-11-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -593 +593 @@
     $x: function(xpath, context)
     {
-        var nodes = [];
-        try {
-            var doc = (context && context.ownerDocument) || inspectedWindow.document;
-            var results = doc.evaluate(xpath, context || doc, null, XPathResult.ANY_TYPE, null);
+        var doc = (context && context.ownerDocument) || inspectedWindow.document;
+        var result = doc.evaluate(xpath, context || doc, null, XPathResult.ANY_TYPE, null);
+        switch (result.resultType) {
+        case XPathResult.NUMBER_TYPE:
+            return result.numberValue;
+        case XPathResult.STRING_TYPE:
+            return result.stringValue;
+        case XPathResult.BOOLEAN_TYPE:
+            return result.booleanValue;
+        default:
+            var nodes = [];
             var node;
-            while (node = results.iterateNext())
+            while (node = result.iterateNext())
                 nodes.push(node);
-        } catch (e) {
-        }
-        return nodes;
+            return nodes;
+        }
     },