Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compareDocumentPosition for attr nodes to work right when the other node is

Browse Source 
also an attr.  Bug 326939, patch by Alex Vincent <ajvincent@gmail.com>, r+sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@189865 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2006-02-13 20:44:39 +00:00
parent d0ce6d695d
commit 4cf750b065
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/content/base/src/nsDOMAttribute.cpp
View File

@ -499,6 +499,15 @@ nsDOMAttribute::CompareDocumentPosition(nsIDOMNode* aOther,
PRUint16 mask = 0;
PRBool sameNode = PR_FALSE;
IsSameNode(aOther, &sameNode);
if (sameNode) {
// If the two nodes being compared are the same node,
// then no flags are set on the return.
*aReturn = 0;
return NS_OK;
}
nsCOMPtr<nsIDOMElement> el;
GetOwnerElement(getter_AddRefs(el));
if (!el) {
@ -522,19 +531,30 @@ nsDOMAttribute::CompareDocumentPosition(nsIDOMNode* aOther,
nsCOMPtr<nsIDOMAttr> otherAttr(do_QueryInterface(aOther));
nsCOMPtr<nsIDOMElement> otherEl;
otherAttr->GetOwnerElement(getter_AddRefs(otherEl));
if (el == otherEl) {
PRBool sameNode = PR_FALSE;
IsSameNode(aOther, &sameNode);
if (!sameNode) {
// If neither of the two determining nodes is a child node and
// nodeType is the same for both determining nodes, then an
// implementation-dependent order between the determining nodes
// is returned.
mask |= nsIDOM3Node::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
}
// If the two nodes being compared are the same node,
// then no flags are set on the return.
if (!otherEl) {
// This is as if they were comparing to us, and our element was null.
// See "if (!el)" above.
mask |= (nsIDOM3Node::DOCUMENT_POSITION_DISCONNECTED |
nsIDOM3Node::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC);
}
else if (el == otherEl) {
// If neither of the two determining nodes is a child node and
// nodeType is the same for both determining nodes, then an
// implementation-dependent order between the determining nodes
// is returned.
mask |= nsIDOM3Node::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
}
else
{
// For attrs owned by elements A and B, if A != B, the right value is
// comparing the tree position of A and B.
nsCOMPtr<nsIDOM3Node> elNode3(do_QueryInterface(el));
PRUint16 parentMask;
elNode3->CompareDocumentPosition(otherEl, &parentMask);
// Though elements can contain each other, attributes can't.
parentMask &= ~(nsIDOM3Node::DOCUMENT_POSITION_CONTAINS |
nsIDOM3Node::DOCUMENT_POSITION_CONTAINED_BY);
mask |= parentMask;
}
*aReturn = mask;
@ -542,8 +562,6 @@ nsDOMAttribute::CompareDocumentPosition(nsIDOMNode* aOther,
return NS_OK;
}
PRBool sameNode = PR_FALSE;
if (nodeType == nsIDOMNode::TEXT_NODE ||
nodeType == nsIDOMNode::CDATA_SECTION_NODE ||
nodeType == nsIDOMNode::ENTITY_REFERENCE_NODE) {