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

Prevent nsDocument from calling |Release| on a stylesheet that it doesn't own when told to remove that stylesheet. Fixes a theme switching crash. b=129620 r=peterv sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116178 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2002-03-08 21:05:27 +00:00
parent fd90a2b09a
commit e9f90d8c2a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/content/base/src/nsDocument.cpp
View File

@ -1317,7 +1317,10 @@ void nsDocument::RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet)
void nsDocument::RemoveStyleSheet(nsIStyleSheet* aSheet)
{
NS_PRECONDITION(nsnull != aSheet, "null arg");
mStyleSheets.RemoveElement(aSheet);
if (!mStyleSheets.RemoveElement(aSheet)) {
NS_NOTREACHED("stylesheet not found");
return;
}
PRBool enabled = PR_TRUE;
aSheet->GetEnabled(enabled);
@ -1352,16 +1355,19 @@ nsDocument::UpdateStyleSheets(nsISupportsArray* aOldSheets, nsISupportsArray* aN
aOldSheets->GetElementAt(i, getter_AddRefs(supp));
sheet = do_QueryInterface(supp);
if (sheet) {
mStyleSheets.RemoveElement(sheet);
PRBool enabled = PR_TRUE;
sheet->GetEnabled(enabled);
if (enabled) {
RemoveStyleSheetFromStyleSets(sheet);
}
PRBool found = mStyleSheets.RemoveElement(sheet);
NS_ASSERTION(found, "stylesheet not found");
if (found) {
PRBool enabled = PR_TRUE;
sheet->GetEnabled(enabled);
if (enabled) {
RemoveStyleSheetFromStyleSets(sheet);
}
sheet->SetOwningDocument(nsnull);
nsIStyleSheet* sheetPtr = sheet.get();
NS_RELEASE(sheetPtr);
sheet->SetOwningDocument(nsnull);
nsIStyleSheet* sheetPtr = sheet.get();
NS_RELEASE(sheetPtr);
}
}
}