Backing out patch from bug 128133 due to the myriad regression - my apologies to all good Mozillans.

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)) {

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)) {