Diff
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (133654 => 133655)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-06 20:10:57 UTC (rev 133654)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-06 20:22:00 UTC (rev 133655)
@@ -1,5 +1,19 @@
2012-11-06 Lucas Forschler <[email protected]>
+ Merge r125631
+
+ 2012-08-14 Chris Evans <[email protected]>
+
+ Handle the XPath / (root) operator correctly for nodes that aren't attached to the document.
+ https://bugs.webkit.org/show_bug.cgi?id=36427
+
+ Reviewed by Abhishek Arya.
+
+ * fast/xpath/xpath-detached-nodes-expected.txt: Added.
+ * fast/xpath/xpath-detached-nodes.html: Added.
+
+2012-11-06 Lucas Forschler <[email protected]>
+
Merge r125503
2012-08-13 Douglas Stockwell <[email protected]>
@@ -11044,3 +11058,4 @@
.
.
.
+.
Copied: branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes-expected.txt (from rev 125631, trunk/LayoutTests/fast/xpath/xpath-detached-nodes-expected.txt) (0 => 133655)
--- branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes-expected.txt (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes-expected.txt 2012-11-06 20:22:00 UTC (rev 133655)
@@ -0,0 +1,12 @@
+This tests XPath expressions on detached document fragments and nodes.
+See https://bugs.webkit.org/show_bug.cgi?id=36427
+
+PASS result.numberValue is 1
+PASS result.numberValue is 0
+PASS result.numberValue is 1
+PASS result.numberValue is 0
+PASS result.numberValue is NaN
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes.html (from rev 125631, trunk/LayoutTests/fast/xpath/xpath-detached-nodes.html) (0 => 133655)
--- branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes.html (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/xpath/xpath-detached-nodes.html 2012-11-06 20:22:00 UTC (rev 133655)
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p>This tests XPath expressions on detached document fragments and nodes.
+<br/>See https://bugs.webkit.org/show_bug.cgi?id=36427
+<div id="console"></div>
+
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ frag = document.createDocumentFragment();
+ child = document.createElement('div');
+ frag.appendChild(child);
+ result = document.evaluate("count(/div)",
+ child, null, XPathResult.NUMBER_TYPE, null);
+ shouldBe("result.numberValue", "1");
+ result = document.evaluate("count(/html)",
+ child, null, XPathResult.NUMBER_TYPE, null);
+ shouldBe("result.numberValue", "0");
+
+ ele = document.createElement('p');
+ ele.appendChild(document.createElement('h1'));
+ result = document.evaluate("count(/h1)",
+ ele, null, XPathResult.NUMBER_TYPE, null);
+ shouldBe("result.numberValue", "1");
+ result = document.evaluate("count(/html)",
+ ele, null, XPathResult.NUMBER_TYPE, null);
+ shouldBe("result.numberValue", "0");
+ result = document.evaluate("/* | *",
+ ele, null, XPathResult.NUMBER_TYPE, null);
+ shouldBe("result.numberValue", "NaN");
+</script>
+<script src=""
+</body>
+</html>
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (133654 => 133655)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-06 20:10:57 UTC (rev 133654)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-06 20:22:00 UTC (rev 133655)
@@ -1,5 +1,25 @@
2012-11-06 Lucas Forschler <[email protected]>
+ Merge r125631
+
+ 2012-08-14 Chris Evans <[email protected]>
+
+ Handle the XPath / (root) operator correctly for nodes that aren't attached to the document.
+ https://bugs.webkit.org/show_bug.cgi?id=36427
+
+ Reviewed by Abhishek Arya.
+
+ We now behave the same as Firefox 14.
+ The consensus seems to be that the XPath spec is ambiguous for the case of detached nodes, and that using the fragment root is more intuitive than the document root for the case of detached nodes.
+ For example, http://www.w3.org/TR/xpath/ section 2 "Location Paths" is only clear for attached nodes: "A / by itself selects the root node of the document containing the context node. If it is followed by a relative location path, then the location path selects the set of nodes that would be selected by the relative location path relative to the root node of the document containing the context node."
+
+ Test: fast/xpath/xpath-detached-nodes.html
+
+ * xml/XPathPath.cpp:
+ (WebCore::XPath::LocationPath::evaluate): Jump to the root of the detached subtree instead of the parent document if the node isn't attached to the document.
+
+2012-11-06 Lucas Forschler <[email protected]>
+
Merge r125503
2012-08-13 Douglas Stockwell <[email protected]>
@@ -206672,3 +206692,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/xml/XPathPath.cpp (133654 => 133655)
--- branches/safari-536.28-branch/Source/WebCore/xml/XPathPath.cpp 2012-11-06 20:10:57 UTC (rev 133654)
+++ branches/safari-536.28-branch/Source/WebCore/xml/XPathPath.cpp 2012-11-06 20:22:00 UTC (rev 133655)
@@ -93,11 +93,16 @@
{
EvaluationContext& evaluationContext = _expression_::evaluationContext();
EvaluationContext backupContext = evaluationContext;
- // For absolute location paths, the context node is ignored - the
- // document's root node is used instead.
+ // For absolute location paths, the context node is ignored. The
+ // document's root node is used for attached nodes, otherwise the root
+ // node of the detached subtree is used.
Node* context = evaluationContext.node.get();
- if (m_absolute && context->nodeType() != Node::DOCUMENT_NODE)
- context = context->ownerDocument();
+ if (m_absolute && context->nodeType() != Node::DOCUMENT_NODE) {
+ if (context->inDocument())
+ context = context->ownerDocument();
+ else
+ context = context->highestAncestor();
+ }
NodeSet nodes;
nodes.append(context);
