Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-06 14:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r=troy; use new line-layout api to help with some resize-reflow optimization bugs

Browse Source
This commit is contained in:
kipp%netscape.com 1999-10-29 14:32:11 +00:00
parent c728469462
commit 911d3089e8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsBRFrame.cpp
View File

@ -103,8 +103,9 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
// Only when the BR is operating in a line-layout situation will it
// behave like a BR.
if (nsnull != aReflowState.mLineLayout) {
if (aReflowState.mLineLayout->CanPlaceFloaterNow()) {
nsLineLayout* ll = aReflowState.mLineLayout;
if (ll) {
if (ll->CanPlaceFloaterNow()) {
// If we can place a floater on the line now it means that the
// line is effectively empty (there may be zero sized compressed
// white-space frames on the line, but they are to be ignored).
@ -151,6 +152,7 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
ll->SetLineEndsInBR(PR_TRUE);
}
else {
aStatus = NS_FRAME_COMPLETE;

6
layout/html/base/src/nsBRFrame.cpp
View File

@ -103,8 +103,9 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
// Only when the BR is operating in a line-layout situation will it
// behave like a BR.
if (nsnull != aReflowState.mLineLayout) {
if (aReflowState.mLineLayout->CanPlaceFloaterNow()) {
nsLineLayout* ll = aReflowState.mLineLayout;
if (ll) {
if (ll->CanPlaceFloaterNow()) {
// If we can place a floater on the line now it means that the
// line is effectively empty (there may be zero sized compressed
// white-space frames on the line, but they are to be ignored).
@ -151,6 +152,7 @@ BRFrame::Reflow(nsIPresContext& aPresContext,
aStatus = NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
NS_INLINE_MAKE_BREAK_TYPE(breakType);
ll->SetLineEndsInBR(PR_TRUE);
}
else {
aStatus = NS_FRAME_COMPLETE;