Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing regression bug 233191. Make sure we fire the correct document notifications when inserting/appending children to a DOM node through the DOM APIs. r=mscott@mozilla.org, sr=bzbarsky@mit.edu

Browse Source
This commit is contained in:
jst%mozilla.jstenback.com 2004-02-06 02:26:10 +00:00
parent 0de6750d91
commit 75d15492c5
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2408,17 +2408,28 @@ nsGenericElement::InsertChildAt(nsIContent* aKid,
{
NS_PRECONDITION(aKid, "null ptr");
mozAutoDocUpdate updateBatch(mDocument, UPDATE_CONTENT_MODEL, aNotify);
PRBool isAppend;
if (aNotify) {
isAppend = aIndex == GetChildCount();
}
if (!InternalInsertChildAt(aKid, aIndex)) {
return NS_OK;
}
aKid->SetParent(this);
nsRange::OwnerChildInserted(this, aIndex);
if (mDocument) {
aKid->SetDocument(mDocument, aDeepSetDocument, PR_TRUE);
if (aNotify) {
mDocument->ContentInserted(this, aKid, aIndex);
if (isAppend) {
mDocument->ContentAppended(this, aIndex);
} else {
mDocument->ContentInserted(this, aKid, aIndex);
}
}
if (HasMutationListeners(this, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
@ -2429,6 +2440,7 @@ nsGenericElement::InsertChildAt(nsIContent* aKid,
aKid->HandleDOMEvent(nsnull, &mutation, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
return NS_OK;
}
@ -2446,8 +2458,9 @@ nsGenericElement::ReplaceChildAt(nsIContent* aKid,
if (!InternalReplaceChildAt(aKid, aIndex)) {
return NS_OK;
}
aKid->SetParent(this);
if (mDocument) {
aKid->SetDocument(mDocument, aDeepSetDocument, PR_TRUE);
if (aNotify) {
@ -2484,6 +2497,7 @@ nsGenericElement::AppendChildTo(nsIContent* aKid, PRBool aNotify,
aKid->SetParent(this);
// ranges don't need adjustment since new child is at end of list
if (mDocument) {
aKid->SetDocument(mDocument, aDeepSetDocument, PR_TRUE);
if (aNotify) {
@ -2498,6 +2512,7 @@ nsGenericElement::AppendChildTo(nsIContent* aKid, PRBool aNotify,
aKid->HandleDOMEvent(nsnull, &mutation, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
return NS_OK;
}
@ -2631,7 +2646,6 @@ nsGenericElement::doInsertBefore(nsIContent *aElement, nsIDOMNode *aNewChild,
case nsIDOMNode::ENTITY_REFERENCE_NODE :
case nsIDOMNode::PROCESSING_INSTRUCTION_NODE :
case nsIDOMNode::COMMENT_NODE :
break;
case nsIDOMNode::DOCUMENT_FRAGMENT_NODE :
break;
default:
@ -2663,7 +2677,7 @@ nsGenericElement::doInsertBefore(nsIContent *aElement, nsIDOMNode *aNewChild,
}
/*
* Check if this is a document fragment. If it is, we need
* Check if we're inserting a document fragment. If we are, we need
* to remove the children of the document fragment and add them
* individually (i.e. we don't add the actual document fragment).
*/

34
content/xul/content/src/nsXULElement.cpp
View File

@ -1760,6 +1760,8 @@ nsXULElement::InsertChildAt(nsIContent* aKid, PRUint32 aIndex, PRBool aNotify,
// freak out.
NS_ASSERTION(mChildren.IndexOf(aKid) < 0, "element is already a child");
PRBool isAppend = aIndex == mChildren.Count();
mozAutoDocUpdate updateBatch(mDocument, UPDATE_CONTENT_MODEL, aNotify);
if (!mChildren.InsertElementAt(aKid, aIndex))
@ -1769,20 +1771,28 @@ nsXULElement::InsertChildAt(nsIContent* aKid, PRUint32 aIndex, PRBool aNotify,
aKid->SetParent(this);
//nsRange::OwnerChildInserted(this, aIndex);
aKid->SetDocument(mDocument, aDeepSetDocument, PR_TRUE);
if (mDocument) {
aKid->SetDocument(mDocument, aDeepSetDocument, PR_TRUE);
if (mDocument && HasMutationListeners(this,
NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
nsMutationEvent mutation(NS_MUTATION_NODEINSERTED, aKid);
mutation.mRelatedNode =
do_QueryInterface(NS_STATIC_CAST(nsIStyledContent*, this));
if (aNotify) {
if (isAppend) {
mDocument->ContentAppended(this, aIndex);
} else {
mDocument->ContentInserted(this, aKid, aIndex);
}
}
nsEventStatus status = nsEventStatus_eIgnore;
aKid->HandleDOMEvent(nsnull, &mutation, nsnull, NS_EVENT_FLAG_INIT, &status);
}
if (HasMutationListeners(this,
NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
nsMutationEvent mutation(NS_MUTATION_NODEINSERTED, aKid);
mutation.mRelatedNode =
do_QueryInterface(NS_STATIC_CAST(nsIStyledContent*, this));
nsEventStatus status = nsEventStatus_eIgnore;
aKid->HandleDOMEvent(nsnull, &mutation, nsnull, NS_EVENT_FLAG_INIT,
&status);
}
if (aNotify && mDocument) {
mDocument->ContentInserted(NS_STATIC_CAST(nsIStyledContent*, this), aKid, aIndex);
}
return NS_OK;
@ -1868,7 +1878,7 @@ nsXULElement::AppendChildTo(nsIContent* aKid, PRBool aNotify,
if (aNotify) {
mDocument->ContentAppended(this, mChildren.Count() - 1);
}
if (HasMutationListeners(this,
NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
nsMutationEvent mutation(NS_MUTATION_NODEINSERTED, aKid);