Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-08 04:27:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merging mozilla-central into mozilla-inbound.

Browse Source
This commit is contained in:
Mounir Lamouri 2011-08-23 17:51:40 +02:00
commit 0f20cbf43c
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsDocument.cpp
View File

@ -6125,7 +6125,7 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
} while ((doc = doc->GetParentDocument())); } while ((doc = doc->GetParentDocument()));
// Remove from parent. // Remove from parent.
nsINode* parent = adoptedNode->GetNodeParent(); nsCOMPtr<nsINode> parent = adoptedNode->GetNodeParent();
if (parent) { if (parent) {
rv = parent->RemoveChildAt(parent->IndexOf(adoptedNode), PR_TRUE); rv = parent->RemoveChildAt(parent->IndexOf(adoptedNode), PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);

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

@ -620,7 +620,7 @@ nsINode::Normalize()
} }
// Remove node // Remove node
nsINode* parent = node->GetNodeParent(); nsCOMPtr<nsINode> parent = node->GetNodeParent();
NS_ASSERTION(parent || hasRemoveListeners, NS_ASSERTION(parent || hasRemoveListeners,
"Should always have a parent unless " "Should always have a parent unless "
"mutation events messed us up"); "mutation events messed us up");
@ -3945,7 +3945,7 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
} }
// Remove the new child from the old parent if one exists // Remove the new child from the old parent if one exists
nsINode* oldParent = newContent->GetNodeParent(); nsCOMPtr<nsINode> oldParent = newContent->GetNodeParent();
if (oldParent) { if (oldParent) {
PRInt32 removeIndex = oldParent->IndexOf(newContent); PRInt32 removeIndex = oldParent->IndexOf(newContent);
if (removeIndex < 0) { if (removeIndex < 0) {

2
content/xbl/src/nsXBLPrototypeBinding.cpp
View File

@ -1213,7 +1213,7 @@ nsXBLPrototypeBinding::ConstructInsertionTable(nsIContent* aContent)
PRInt32 i; PRInt32 i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
nsIContent* child = childrenElements[i]; nsIContent* child = childrenElements[i];
nsIContent* parent = child->GetParent(); nsCOMPtr<nsIContent> parent = child->GetParent();
// Create an XBL insertion point entry. // Create an XBL insertion point entry.
nsXBLInsertionPointEntry* xblIns = nsXBLInsertionPointEntry::Create(parent); nsXBLInsertionPointEntry* xblIns = nsXBLInsertionPointEntry::Create(parent);

3
content/xul/document/src/nsXULDocument.cpp
View File

@ -4047,7 +4047,8 @@ nsXULDocument::OverlayForwardReference::Merge(nsIContent* aTargetNode,
if (attr == nsGkAtoms::removeelement && if (attr == nsGkAtoms::removeelement &&
value.EqualsLiteral("true")) { value.EqualsLiteral("true")) {
rv = RemoveElement(aTargetNode->GetParent(), aTargetNode); nsCOMPtr<nsIContent> parent = aTargetNode->GetParent();
rv = RemoveElement(parent, aTargetNode);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
return NS_OK; return NS_OK;

2
content/xul/templates/src/nsXULContentBuilder.cpp
View File

@ -1324,7 +1324,7 @@ nsXULContentBuilder::RemoveGeneratedContent(nsIContent* aElement)
while (0 != (count = ungenerated.Length())) { while (0 != (count = ungenerated.Length())) {
// Pull the next "ungenerated" element off the queue. // Pull the next "ungenerated" element off the queue.
PRUint32 last = count - 1; PRUint32 last = count - 1;
nsIContent* element = ungenerated[last]; nsCOMPtr<nsIContent> element = ungenerated[last];
ungenerated.RemoveElementAt(last); ungenerated.RemoveElementAt(last);
PRUint32 i = element->GetChildCount(); PRUint32 i = element->GetChildCount();

4
parser/html/nsHtml5TreeOperation.cpp
View File

@ -280,7 +280,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
case eTreeOpDetach: { case eTreeOpDetach: {
nsIContent* node = *(mOne.node); nsIContent* node = *(mOne.node);
aBuilder->FlushPendingAppendNotifications(); aBuilder->FlushPendingAppendNotifications();
nsIContent* parent = node->GetParent(); nsCOMPtr<nsIContent> parent = node->GetParent();
if (parent) { if (parent) {
nsHtml5OtherDocUpdate update(parent->GetOwnerDoc(), nsHtml5OtherDocUpdate update(parent->GetOwnerDoc(),
aBuilder->GetDocument()); aBuilder->GetDocument());
@ -292,7 +292,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
return rv; return rv;
} }
case eTreeOpAppendChildrenToNewParent: { case eTreeOpAppendChildrenToNewParent: {
nsIContent* node = *(mOne.node); nsCOMPtr<nsIContent> node = *(mOne.node);
nsIContent* parent = *(mTwo.node); nsIContent* parent = *(mTwo.node);
aBuilder->FlushPendingAppendNotifications(); aBuilder->FlushPendingAppendNotifications();