diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too! diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too! diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too! diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too! diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too! diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 7c7531c3cbc..c25cee2af37 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -2474,6 +2474,9 @@ nsBlockFrame::ResizeReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::ReflowLinesAt(nsBlockReflowState& aState, LineData* aLine) { + // Inform line layout of where the text runs are + aState.mLineLayout.SetReflowTextRuns(mTextRuns); + // Reflow the lines that are already ours while (nsnull != aLine) { nsReflowStatus rs; @@ -3452,7 +3455,6 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, ("nsBlockFrame::PlaceLine: clearing floaters=%d", breakType)); aState.ClearFloaters(breakType); -ListTag(stdout); printf(": clearing %x\n", breakType); break; } // XXX page breaks, etc, need to be passed upwards too!