Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed check for a band count of when when clearing floaters because if the floater is large the band may only have one trapezoid in it

Browse Source
This commit is contained in:
kipp%netscape.com 1998-12-08 03:47:44 +00:00
parent abfa4440e7
commit 2025694b82
6 changed files with 168 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
layout/generic/nsBlockFrame.cpp
View File

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;

58
layout/generic/nsBlockReflowState.cpp
View File

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;

58
layout/generic/nsBlockReflowState.h
View File

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;

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

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;

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

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;

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

@ -3854,43 +3854,41 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
mY = aY;
GetAvailableSpace();
// Compute aY in space-manager "root" coordinates.
nscoord finalY = oldY;
if (mCurrentBand.count > 1) {
// Compute aY in space-manager "root" coordinates.
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
nscoord aYS = (aY - mBorderPadding.top) + mSpaceManagerY;
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
// Calculate the largest trapezoid YMost for the appropriate
// floaters in this band.
PRBool haveFloater = PR_FALSE;
nscoord yMost = aYS;
PRInt32 i;
for (i = 0; i < mCurrentBand.count; i++) {
nsBandTrapezoid* trapezoid = &mCurrentBand.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
PRInt32 fn, numFrames = trapezoid->frames->Count();
NS_ASSERTION(numFrames > 0, "bad trapezoid frame list");
for (fn = 0; fn < numFrames; fn++) {
nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn);
if (ShouldClearFrame(frame, aBreakType)) {
nscoord ym = GetFrameYMost(frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
else if (ShouldClearFrame(trapezoid->frame, aBreakType)) {
nscoord ym = GetFrameYMost(trapezoid->frame);
if (ym > yMost) yMost = ym;
}
}
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
// If yMost is unchanged (aYS) then there were no appropriate
// floaters in the band. In that case we restore mY to its
// original value.
if (yMost != aYS) {
finalY = aY + (yMost - aYS);
}
mY = finalY;