Fixing bad automatic merge

This commit is contained in:
Henri Sivonen 2009-06-11 17:11:05 +03:00
parent 5cad7e2a33
commit 2d33f6a092

View File

@ -761,18 +761,6 @@ txXPathNodeUtils::comparePosition(const txXPathNode& aNode,
return total < otherTotal ? -1 : 1;
}
/* static */
PRBool
txXPathNodeUtils::isHTMLElementInHTMLDocument(const txXPathNode& aNode)
{
if (!aNode.isContent()) {
return PR_FALSE;
}
nsIContent* content = aNode.Content();
return (content->IsNodeOfType(nsINode::eHTML) &&
!(content->GetOwnerDoc()->IsCaseSensitive()));
}
/* static */
txXPathNode*
txXPathNativeNode::createXPathNode(nsIContent* aContent, PRBool aKeepRootAlive)