Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text Zoom leaves misaligned overlapping text, b=128405, r=roc, sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@163573 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au
2004-10-12 03:04:47 +00:00
parent 9f6dca52a6
commit d2e4f132a9
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/generic/nsLineLayout.cpp
View File

@@ -858,7 +858,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsReflowReason reason = eReflowReason_Resize;
if (NS_FRAME_FIRST_REFLOW & aFrame->GetStateBits()) {
reason = eReflowReason_Initial;
}
}
else if (rs->reason == eReflowReason_Initial &&
mBlockReflowState->reason == eReflowReason_StyleChange) {
// The frame we're about to reflow is an _old_ frame that was
// pushed inside a _new_ parent (overflow).
// So we propagate the same 'style change' that led to creating
// the new overflow parent to which this frame is now the child
reason = eReflowReason_StyleChange;
}
else if (rs->reason == eReflowReason_Incremental) { // XXX
// XXXwaterson (above) previously used mBlockReflowState rather
// than psd->mReflowState.

11
mozilla/layout/html/base/src/nsLineLayout.cpp
View File

@@ -858,7 +858,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsReflowReason reason = eReflowReason_Resize;
if (NS_FRAME_FIRST_REFLOW & aFrame->GetStateBits()) {
reason = eReflowReason_Initial;
}
}
else if (rs->reason == eReflowReason_Initial &&
mBlockReflowState->reason == eReflowReason_StyleChange) {
// The frame we're about to reflow is an _old_ frame that was
// pushed inside a _new_ parent (overflow).
// So we propagate the same 'style change' that led to creating
// the new overflow parent to which this frame is now the child
reason = eReflowReason_StyleChange;
}
else if (rs->reason == eReflowReason_Incremental) { // XXX
// XXXwaterson (above) previously used mBlockReflowState rather
// than psd->mReflowState.