Pass through text-runs to the line layout engine; removed a debug printf
git-svn-id: svn://10.0.0.236/trunk@12503 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
433fa79a05
commit
f28564b030
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -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!
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user