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

Followup to bug 378784 based on rbs's review comments.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@226010 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2007-05-06 22:50:21 +00:00
parent a5510fca0d
commit c1b00f99bb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/base/nsPresShell.cpp
View File

@@ -813,7 +813,7 @@ public:
NS_IMETHOD GetPlaceholderFrameFor(nsIFrame* aFrame,
nsIFrame** aPlaceholderFrame) const;
NS_IMETHOD FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
nsFrameState aBitsToAdd);
nsFrameState aBitToAdd);
NS_IMETHOD CancelAllPendingReflows();
NS_IMETHOD IsSafeToFlush(PRBool& aIsSafeToFlush);
NS_IMETHOD FlushPendingNotifications(mozFlushType aType);
@@ -3114,10 +3114,10 @@ PresShell::VerifyHasDirtyRootAncestor(nsIFrame* aFrame)
NS_IMETHODIMP
PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
nsFrameState aBitsToAdd)
nsFrameState aBitToAdd)
{
NS_PRECONDITION(aBitsToAdd == NS_FRAME_IS_DIRTY ||
aBitsToAdd == NS_FRAME_HAS_DIRTY_CHILDREN,
NS_PRECONDITION(aBitToAdd == NS_FRAME_IS_DIRTY ||
aBitToAdd == NS_FRAME_HAS_DIRTY_CHILDREN,
"Unexpected bits being added");
// XXX Add this assertion at some point!? nsSliderFrame triggers it a lot.
@@ -3152,7 +3152,7 @@ PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
// Grab |wasDirty| now so we can go ahead and update the bits on
// aFrame and then get |targetFrameDirty|.
PRBool wasDirty = NS_SUBTREE_DIRTY(aFrame);
aFrame->AddStateBits(aBitsToAdd);
aFrame->AddStateBits(aBitToAdd);
PRBool targetFrameDirty = ((aFrame->GetStateBits() & NS_FRAME_IS_DIRTY) != 0);
#define FRAME_IS_REFLOW_ROOT(_f) \
((_f->GetStateBits() & NS_FRAME_REFLOW_ROOT) && \