Bug 1046534 - Call DropDocumentReference on a document's CSSLoader before we unlink it. r=dbaron

This commit is contained in:
Cameron McCormack 2014-08-01 10:45:02 +10:00
parent 9a7ed6c756
commit fdcf00e285

View File

@ -1709,7 +1709,7 @@ nsDocument::~nsDocument()
} }
if (mCSSLoader) { if (mCSSLoader) {
// Could be null here if Init() failed // Could be null here if Init() failed or if we have been unlinked.
mCSSLoader->DropDocumentReference(); mCSSLoader->DropDocumentReference();
} }
@ -2085,7 +2085,10 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
tmp->mPendingTitleChangeEvent.Revoke(); tmp->mPendingTitleChangeEvent.Revoke();
if (tmp->mCSSLoader) {
tmp->mCSSLoader->DropDocumentReference();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mCSSLoader) NS_IMPL_CYCLE_COLLECTION_UNLINK(mCSSLoader)
}
for (uint32_t i = 0; i < tmp->mHostObjectURIs.Length(); ++i) { for (uint32_t i = 0; i < tmp->mHostObjectURIs.Length(); ++i) {
nsHostObjectProtocolHandler::RemoveDataEntry(tmp->mHostObjectURIs[i]); nsHostObjectProtocolHandler::RemoveDataEntry(tmp->mHostObjectURIs[i]);