corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 602516 - Either PresShell::Freeze needs to consistently null check mDocument to avoid a crash [@ PresShell::UpdateImageLockingState]. r+a=bz

Browse Source
This commit is contained in:
2010-12-09 20:10:45 +01:00
parent d4b0a20991
commit 61c664e54d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsPresShell.cpp
View File

@@ -7478,13 +7478,15 @@ PresShell::Freeze()
mDocument->EnumerateFreezableElements(FreezeElement, nsnull); mDocument->EnumerateFreezableElements(FreezeElement, nsnull);
if (mCaret) if (mCaret) {
mCaret->SetCaretVisible(PR_FALSE); mCaret->SetCaretVisible(PR_FALSE);
}
mPaintingSuppressed = PR_TRUE; mPaintingSuppressed = PR_TRUE;
if (mDocument) if (mDocument) {
mDocument->EnumerateSubDocuments(FreezeSubDocument, nsnull); mDocument->EnumerateSubDocuments(FreezeSubDocument, nsnull);
}
nsPresContext* presContext = GetPresContext(); nsPresContext* presContext = GetPresContext();
if (presContext && if (presContext &&
@@ -7493,7 +7495,9 @@ PresShell::Freeze()
} }
mFrozen = PR_TRUE; mFrozen = PR_TRUE;
if (mDocument) {
UpdateImageLockingState(); UpdateImageLockingState();
}
} }
void void