corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 333942. Move GetParent to nsINode and add GetNodeParent there too. There is a risk that this'll add some binary size, but hopefully not too much. r/sr=bz

Browse Source
This commit is contained in:
cvshook@sicking.cc
2006-04-15 05:09:16 +00:00
parent 9edf56cc22
commit 44c8d5f474
10 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
content/base/src/nsGenericElement.cpp
View File

@@ -949,20 +949,11 @@ nsGenericElement::GetNodeType(PRUint16* aNodeType)
NS_IMETHODIMP
nsGenericElement::GetParentNode(nsIDOMNode** aParentNode)
{
nsIContent *parent = GetParent();
nsINode *parent = GetNodeParent();
if (parent) {
return CallQueryInterface(parent, aParentNode);
}
nsIDocument* doc = GetCurrentDoc();
if (doc) {
// If we don't have a parent, but we're in the document, we must
// be the root node of the document. The DOM says that the root
// is the document.
return CallQueryInterface(doc, aParentNode);
}
*aParentNode = nsnull;
return NS_OK;
@@ -1766,12 +1757,13 @@ nsGenericElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
slots->mBindingParent = aBindingParent; // Weak, so no addref happens.
}
// Now set the parent; make sure to preserve the bits we have stashed there
// Note that checking whether aParent == GetParent() is probably not worth it
// here.
PtrBits new_bits = NS_REINTERPRET_CAST(PtrBits, aParent);
new_bits |= mParentPtrBits & nsIContent::kParentBitMask;
mParentPtrBits = new_bits;
// Now set the parent
if (aParent) {
mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aParent) | PARENT_BIT_PARENT_IS_CONTENT;
}
else {
mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aDocument);
}
nsresult rv;
@@ -1881,12 +1873,7 @@ nsGenericElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
}
// Unset things in the reverse order from how we set them in BindToTree
mParentPtrBits &= ~PARENT_BIT_INDOCUMENT;
if (aNullParent) {
// Just mask it out
mParentPtrBits &= nsIContent::kParentBitMask;
}
mParentPtrBits = aNullParent ? 0 : mParentPtrBits & ~PARENT_BIT_INDOCUMENT;
nsDOMSlots *slots = GetExistingDOMSlots();
if (slots) {
@@ -3049,15 +3036,8 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
PRBool newContentIsXUL = newContent->IsContentOfType(eXUL);
// Remove the element from the old parent if one exists
nsINode* oldParent = newContent->GetParent();
if (!oldParent) {
oldParent = newContent->GetCurrentDoc();
nsINode* oldParent = newContent->GetNodeParent();
// See bug 53901. Crappy XUL sometimes lies about being in the document
if (oldParent && newContentIsXUL && oldParent->IndexOf(newContent) < 0) {
oldParent = nsnull;
}
}
if (oldParent) {
PRInt32 removeIndex = oldParent->IndexOf(newContent);