Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be a little more careful about whether we have dirty roots. Bug 332807,

Browse Source 
r+sr=dbaron
This commit is contained in:
bzbarsky%mit.edu 2007-03-13 21:21:03 +00:00
parent 64777640f2
commit 0d33609a3d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsPresShell.cpp
View File

@ -5765,11 +5765,11 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
if (0 != mDirtyRoots.Count()) { if (0 != mDirtyRoots.Count()) {
nsHTMLReflowMetrics desiredSize; nsHTMLReflowMetrics desiredSize;
nsIRenderingContext* rcx; nsCOMPtr<nsIRenderingContext> rcx;
nsIFrame* rootFrame = FrameManager()->GetRootFrame(); nsIFrame* rootFrame = FrameManager()->GetRootFrame();
nsSize maxSize = rootFrame->GetSize(); nsSize maxSize = rootFrame->GetSize();
nsresult rv=CreateRenderingContext(rootFrame, &rcx); nsresult rv=CreateRenderingContext(rootFrame, getter_AddRefs(rcx));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
#ifdef DEBUG #ifdef DEBUG
@ -5791,8 +5791,11 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
mDocument->BeginUpdate(UPDATE_ALL); mDocument->BeginUpdate(UPDATE_ALL);
mDocument->EndUpdate(UPDATE_ALL); mDocument->EndUpdate(UPDATE_ALL);
// Scope for the reflow entry point // That might have executed (via XBL binding constructors). So we may no
{ // longer have reflow commands. In fact, we may have had Destroy() called.
// Scope for the reflow entry point, in addition to the |if| condition.
if (!mIsDestroying && mDirtyRoots.Count() != 0) {
AUTO_LAYOUT_PHASE_ENTRY_POINT(GetPresContext(), Reflow); AUTO_LAYOUT_PHASE_ENTRY_POINT(GetPresContext(), Reflow);
mIsReflowing = PR_TRUE; mIsReflowing = PR_TRUE;
@ -5882,8 +5885,6 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
mIsReflowing = PR_FALSE; mIsReflowing = PR_FALSE;
} }
NS_IF_RELEASE(rcx);
// If any new reflow commands were enqueued during the reflow, // If any new reflow commands were enqueued during the reflow,
// schedule another reflow event to process them. // schedule another reflow event to process them.
if (mDirtyRoots.Count()) if (mDirtyRoots.Count())