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

Simply floater counters; handle case of a single occupied trapezoid

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24762 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-03-23 01:32:55 +00:00
parent 66a375fa18
commit 2bea53205b
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/generic/nsBlockBandData.cpp
View File

@@ -90,8 +90,7 @@ nsBlockBandData::ComputeAvailSpaceRect()
nsBandTrapezoid* trapezoid = mData;
nsBandTrapezoid* rightTrapezoid = nsnull;
PRInt32 leftFloaters = 0;
PRInt32 rightFloaters = 0;
PRInt32 floaters = 0;
if (count > 1) {
// If there's more than one trapezoid that means there are floaters
PRInt32 i;
@@ -111,10 +110,10 @@ nsBlockBandData::ComputeAvailSpaceRect()
f->GetStyleData(eStyleStruct_Display,
(const nsStyleStruct*&)display);
if (NS_STYLE_FLOAT_LEFT == display->mFloats) {
leftFloaters++;
floaters++;
}
else if (NS_STYLE_FLOAT_RIGHT == display->mFloats) {
rightFloaters++;
floaters++;
if ((nsnull == rightTrapezoid) && (i > 0)) {
rightTrapezoid = &mData[i - 1];
}
@@ -124,10 +123,10 @@ nsBlockBandData::ComputeAvailSpaceRect()
trapezoid->frame->GetStyleData(eStyleStruct_Display,
(const nsStyleStruct*&)display);
if (NS_STYLE_FLOAT_LEFT == display->mFloats) {
leftFloaters++;
floaters++;
}
else if (NS_STYLE_FLOAT_RIGHT == display->mFloats) {
rightFloaters++;
floaters++;
if ((nsnull == rightTrapezoid) && (i > 0)) {
rightTrapezoid = &mData[i - 1];
}
@@ -136,8 +135,12 @@ nsBlockBandData::ComputeAvailSpaceRect()
}
}
}
mLeftFloaters = leftFloaters;
mRightFloaters = rightFloaters;
else if (mData[0].state != nsBandTrapezoid::Available) {
// We have a floater using up all the available space
floaters = 1;
}
mFloaters = floaters;
if (nsnull != rightTrapezoid) {
trapezoid = rightTrapezoid;
}
@@ -251,8 +254,7 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame)
return y + r.height;
}
// XXX optimization? use mLeftFloaters && mRightFloaters to avoid
// doing anything
// XXX optimization? use mFloaters to avoid doing anything
nscoord
nsBlockBandData::ClearFloaters(nscoord aY, PRUint8 aBreakType)
{