From 13c4539d6c3e7c763038f21ba8d6a40d8b408dfe Mon Sep 17 00:00:00 2001 From: "attinasi%netscape.com" Date: Mon, 8 Apr 2002 23:57:37 +0000 Subject: [PATCH] Backing out patch from bug 128133 due to the myriad regression - my apologies to all good Mozillans. --- layout/generic/nsBlockFrame.cpp | 7 +++++++ layout/html/base/src/nsBlockFrame.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index e64d89e90315..b8bb7c8e10fc 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -2122,6 +2122,7 @@ 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) { @@ -2277,6 +2278,8 @@ 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); @@ -2312,6 +2315,10 @@ 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/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index e64d89e90315..b8bb7c8e10fc 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -2122,6 +2122,7 @@ 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) { @@ -2277,6 +2278,8 @@ 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); @@ -2312,6 +2315,10 @@ 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)) {