From 6bc6a98dd4f29210d7f8d5d31b9ef94561663d0c Mon Sep 17 00:00:00 2001 From: "attinasi%netscape.com" Date: Sun, 7 Apr 2002 18:20:27 +0000 Subject: [PATCH] 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 --- mozilla/layout/generic/nsBlockFrame.cpp | 7 ------- mozilla/layout/html/base/src/nsBlockFrame.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index b8bb7c8e10f..e64d89e9031 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -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)) { diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index b8bb7c8e10f..e64d89e9031 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -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)) {