mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
Bug 392873 - "crash in nsExpirationTracker<nsSHEntry,3>::RemoveObject" (add more debugging code) [p=roc r+sr=bzbarsky a1.9=damons]
This commit is contained in:
parent
6adc9d9130
commit
9db9a73399
@ -161,13 +161,15 @@ nsSHEntry::~nsSHEntry()
|
||||
viewer->Destroy();
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
nsExpirationTracker<nsSHEntry,3>::Iterator iterator(gHistoryTracker);
|
||||
nsSHEntry* elem;
|
||||
while ((elem = iterator.Next()) != nsnull) {
|
||||
NS_ASSERTION(elem != this, "Found dead entry still in the tracker!");
|
||||
if (elem == this) {
|
||||
// CRASH NOW (not later)
|
||||
*(int*)0 = 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//*****************************************************************************
|
||||
@ -233,6 +235,13 @@ nsSHEntry::SetContentViewer(nsIContentViewer *aViewer)
|
||||
mContentViewer = aViewer;
|
||||
|
||||
if (mContentViewer) {
|
||||
if (mExpirationState.IsTracked()) {
|
||||
NS_ERROR("This object should not already be in the tracker!!!");
|
||||
*(int*)0 = 0; // CRASH, take this out before we release for real!
|
||||
} else {
|
||||
gHistoryTracker->AddObject(this);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIDOMDocument> domDoc;
|
||||
mContentViewer->GetDOMDocument(getter_AddRefs(domDoc));
|
||||
// Store observed document in strong pointer in case it is removed from
|
||||
@ -242,8 +251,6 @@ nsSHEntry::SetContentViewer(nsIContentViewer *aViewer)
|
||||
mDocument->SetShellsHidden(PR_TRUE);
|
||||
mDocument->AddMutationObserver(this);
|
||||
}
|
||||
|
||||
gHistoryTracker->AddObject(this);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
Loading…
Reference in New Issue
Block a user