stop positioning views for floaters before the frame is placed - avoids flicker due to painting at erroneous position. b=128133 r=karnaze,dbaron sr=waterson a=roc,jaimejr
git-svn-id: svn://10.0.0.236/trunk@118445 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
82a105abd5
commit
6bc6a98dd4
@ -2122,7 +2122,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
PRBool keepGoing = PR_TRUE;
|
||||
PRBool repositionViews = PR_FALSE; // should we really need this?
|
||||
|
||||
#ifdef DEBUG
|
||||
if (gNoisyReflow) {
|
||||
@ -2278,8 +2277,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
} else {
|
||||
if (deltaY != 0)
|
||||
SlideLine(aState, line, deltaY);
|
||||
else
|
||||
repositionViews = PR_TRUE;
|
||||
|
||||
// XXX EVIL O(N^2) EVIL
|
||||
aState.RecoverStateFrom(line, deltaY);
|
||||
@ -2315,10 +2312,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
aState.mPrevChild = line.prev()->LastChild();
|
||||
}
|
||||
|
||||
// Should we really have to do this?
|
||||
if (repositionViews)
|
||||
::PlaceFrameView(aState.mPresContext, this);
|
||||
|
||||
// Pull data from a next-in-flow if there's still room for more
|
||||
// content here.
|
||||
while (keepGoing && (nsnull != aState.mNextInFlow)) {
|
||||
|
||||
@ -2122,7 +2122,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
PRBool keepGoing = PR_TRUE;
|
||||
PRBool repositionViews = PR_FALSE; // should we really need this?
|
||||
|
||||
#ifdef DEBUG
|
||||
if (gNoisyReflow) {
|
||||
@ -2278,8 +2277,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
} else {
|
||||
if (deltaY != 0)
|
||||
SlideLine(aState, line, deltaY);
|
||||
else
|
||||
repositionViews = PR_TRUE;
|
||||
|
||||
// XXX EVIL O(N^2) EVIL
|
||||
aState.RecoverStateFrom(line, deltaY);
|
||||
@ -2315,10 +2312,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
|
||||
aState.mPrevChild = line.prev()->LastChild();
|
||||
}
|
||||
|
||||
// Should we really have to do this?
|
||||
if (repositionViews)
|
||||
::PlaceFrameView(aState.mPresContext, this);
|
||||
|
||||
// Pull data from a next-in-flow if there's still room for more
|
||||
// content here.
|
||||
while (keepGoing && (nsnull != aState.mNextInFlow)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user