Merge 125631

Source/WebCore/xml/XPathPath.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 75 matching lines @@
 
 LocationPath::~LocationPath()
 {
     deleteAllValues(m_steps);
 }
 
 Value LocationPath::evaluate() const
 {
     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);
     evaluate(nodes);
     
     evaluationContext = backupContext;
     return Value(nodes, Value::adopt);
 }
 
 void LocationPath::evaluate(NodeSet& nodes) const
@@ skipping 85 matching lines @@
     Value v = m_filter->evaluate();
 
     NodeSet& nodes = v.modifiableNodeSet();
     m_path->evaluate(nodes);
     
     return v;
 }
 
 }
 }