diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 507ec176ae0b..2a1c9c8df879 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -4716,7 +4716,6 @@ nsBlockFrame::PlaceLine(BlockReflowInput& aState, aState.mReflowStatus.SetInlineLineBreakBeforeAndReset(); // Reflow the line again when we reflow at our new position. aLine->MarkDirty(); - *aKeepReflowGoing = false; return true; } @@ -4728,7 +4727,6 @@ nsBlockFrame::PlaceLine(BlockReflowInput& aState, if (ShouldAvoidBreakInside(aState.mReflowInput)) { // All our content doesn't fit, start on the next page. aState.mReflowStatus.SetInlineLineBreakBeforeAndReset(); - *aKeepReflowGoing = false; } else { // Push aLine and all of its children and anything else that // follows to our next-in-flow. @@ -4737,10 +4735,6 @@ nsBlockFrame::PlaceLine(BlockReflowInput& aState, return true; } - // Note that any early return before this update of aState.mBCoord - // must either (a) return false or (b) set aKeepReflowGoing to false. - // Otherwise we'll keep reflowing later lines at an incorrect - // position, and we might not come back and clean up the damage later. aState.mBCoord = newBCoord; // Add the already placed current-line floats to the line diff --git a/layout/reftests/columns/break-avoid-line-position-1-ref.html b/layout/reftests/columns/break-avoid-line-position-1-ref.html deleted file mode 100644 index 1f9315219c29..000000000000 --- a/layout/reftests/columns/break-avoid-line-position-1-ref.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -
abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222 abcdefghijkl3333333333
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222 abcdefghijkl3333333333
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222 abcdefghijkl3333333333
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222 abcdefghijkl3333333333
-abcdefghijkl0000000000 abcdefghijkl1111111111 abcdefghijkl2222222222
-abcdefghijkl0000000000 abcdefghijkl1111111111
-