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

Fix debug-only crash. Bug 155259, r=harishd, sr=jag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@124451 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2002-07-02 01:25:23 +00:00
parent 7e2732bbd5
commit 3aea8ccfdb
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/base/src/nsContentList.cpp
View File

@@ -666,6 +666,9 @@ nsContentList::ContentInserted(nsIDocument *aDocument,
nsIContent* aChild,
PRInt32 aIndexInContainer)
{
// Note that aContainer can be null here if we are inserting into
// the document itself; any attempted optimizations to this method
// should deal with that.
if (mState == LIST_DIRTY)
return NS_OK;
@@ -703,6 +706,9 @@ nsContentList::ContentRemoved(nsIDocument *aDocument,
nsIContent* aChild,
PRInt32 aIndexInContainer)
{
// Note that aContainer can be null here if we are inserting into
// the document itself; any attempted optimizations to this method
// should deal with that.
if (IsDescendantOfRoot(aContainer)) {
if (MatchSelf(aChild)) {
mState = LIST_DIRTY;
@@ -910,9 +916,17 @@ nsContentList::IsDescendantOfRoot(nsIContent* aContainer)
{
if (!mRootContent) {
#ifdef DEBUG
nsCOMPtr<nsIDocument> doc;
aContainer->GetDocument(*getter_AddRefs(doc));
NS_ASSERTION(doc == mDocument, "We should not get in here if aContainer is appended to some _other_ document!");
// aContainer can be null when ContentInserted/ContentRemoved are
// called, but we still want to return PR_TRUE in such cases if
// mRootContent is null. We could pass the document into this
// method instead of trying to get it from aContainer, but that
// seems a little pointless just to run this debug-only integrity
// check.
if (aContainer) {
nsCOMPtr<nsIDocument> doc;
aContainer->GetDocument(*getter_AddRefs(doc));
NS_ASSERTION(doc == mDocument, "We should not get in here if aContainer is in some _other_ document!");
}
#endif
return PR_TRUE;
}