Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug #14959. Made sure that lines with floaters are also marked

Browse Source 
dirty
This commit is contained in:
troy%netscape.com 1999-09-27 20:53:05 +00:00
parent 1d0621c58c
commit 7a30e821a3
6 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsBlockFrame.cpp
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();

7
layout/generic/nsBlockReflowState.cpp
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();

7
layout/generic/nsBlockReflowState.h
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();

7
layout/html/base/src/nsBlockFrame.cpp
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();

7
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();

7
layout/html/base/src/nsBlockReflowState.h
View File

@ -1907,9 +1907,12 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
// - it's inline (not a block)
// - it's either the last line in the block -or- it ended with a
// break after
// - there are no floaters associated with the line (reflowing the
// placeholder frame causes the floater to be reflowed)
if (line->IsBlock() ||
(line->mNext && (line->mBreakType != NS_STYLE_CLEAR_NONE)) ||
(line->mCombinedArea.XMost() > newAvailWidth)) {
(line->mNext && (line->mBreakType == NS_STYLE_CLEAR_NONE)) ||
line->mFloaters.NotEmpty() ||
(line->mBounds.XMost() > newAvailWidth)) {
// We have to mark the line dirty
line->MarkDirty();