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

Removed a duplicated method; moved by debug asserts into a central spot

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@23179 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-03-08 19:22:55 +00:00
parent 0547776b90
commit c60c176227
4 changed files with 46 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,14 @@ nsBlockBandData::Init(nsISpaceManager* aSpaceManager,
aSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
mSpace = aSpace;
#ifdef DEBUG_kipp
if (mSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mSpace.width > -200000) && (mSpace.width < 200000), "oy");
}
if (mSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mSpace.height > -200000) && (mSpace.height < 200000), "oy");
}
#endif
return NS_OK;
}
@@ -67,41 +75,9 @@ nsBlockBandData::GetAvailableSpace(nscoord aY, nsRect& aResult)
// Compute the bounding rect of the available space, i.e. space
// between any left and right floaters.
ComputeAvailSpaceRect();
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
aResult = mAvailSpace;
}
// Get the available reflow space for the current y coordinate. The
// available space is relative to our coordinate system (0,0) is our
// upper left corner.
void
nsBlockBandData::GetAvailableSpace(nscoord aY)
{
// Get the raw band data for the given Y coordinate
mSpaceManager->GetBandData(aY, mSpace, *this);
// Compute the bounding rect of the available space, i.e. space
// between any left and right floaters.
ComputeAvailSpaceRect();
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
#ifdef DEBUG_kipp
if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy");
}
if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy");
}
#endif
}
/**
* Computes the bounding rect of the available space, i.e. space
* between any left and right floaters. Uses the current trapezoid
@@ -206,6 +182,19 @@ nsBlockBandData::ComputeAvailSpaceRect()
}
mAvailSpace.width = 0;
}
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
#ifdef DEBUG_kipp
if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy");
}
if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy");
}
#endif
}
/**
@@ -285,7 +274,8 @@ nsBlockBandData::ClearFloaters(nscoord aY, PRUint8 aBreakType)
{
for (;;) {
// Update band information based on target Y before clearing.
GetAvailableSpace(aY);
mSpaceManager->GetBandData(aY, mSpace, *this);
ComputeAvailSpaceRect();
// Compute aYS as aY in space-manager "root" coordinates.
nscoord aYS = aY + mSpaceManagerY;

1
mozilla/layout/generic/nsBlockBandData.h
View File

@@ -96,7 +96,6 @@ protected:
PRInt32 mLeftFloaters, mRightFloaters;
void ComputeAvailSpaceRect();
void GetAvailableSpace(nscoord aY);
PRBool ShouldClearFrame(nsIFrame* aFrame, PRUint8 aBreakType);
nscoord GetFrameYMost(nsIFrame* aFrame);
};

56
mozilla/layout/html/base/src/nsBlockBandData.cpp
View File

@@ -52,6 +52,14 @@ nsBlockBandData::Init(nsISpaceManager* aSpaceManager,
aSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
mSpace = aSpace;
#ifdef DEBUG_kipp
if (mSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mSpace.width > -200000) && (mSpace.width < 200000), "oy");
}
if (mSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mSpace.height > -200000) && (mSpace.height < 200000), "oy");
}
#endif
return NS_OK;
}
@@ -67,41 +75,9 @@ nsBlockBandData::GetAvailableSpace(nscoord aY, nsRect& aResult)
// Compute the bounding rect of the available space, i.e. space
// between any left and right floaters.
ComputeAvailSpaceRect();
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
aResult = mAvailSpace;
}
// Get the available reflow space for the current y coordinate. The
// available space is relative to our coordinate system (0,0) is our
// upper left corner.
void
nsBlockBandData::GetAvailableSpace(nscoord aY)
{
// Get the raw band data for the given Y coordinate
mSpaceManager->GetBandData(aY, mSpace, *this);
// Compute the bounding rect of the available space, i.e. space
// between any left and right floaters.
ComputeAvailSpaceRect();
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
#ifdef DEBUG_kipp
if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy");
}
if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy");
}
#endif
}
/**
* Computes the bounding rect of the available space, i.e. space
* between any left and right floaters. Uses the current trapezoid
@@ -206,6 +182,19 @@ nsBlockBandData::ComputeAvailSpaceRect()
}
mAvailSpace.width = 0;
}
// Fixup width
if (NS_UNCONSTRAINEDSIZE == mSpace.width) {
mAvailSpace.width = NS_UNCONSTRAINEDSIZE;
}
#ifdef DEBUG_kipp
if (mAvailSpace.width != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.width > -200000) && (mAvailSpace.width < 200000), "oy");
}
if (mAvailSpace.height != NS_UNCONSTRAINEDSIZE) {
NS_ASSERTION((mAvailSpace.height > -200000) && (mAvailSpace.height < 200000), "oy");
}
#endif
}
/**
@@ -285,7 +274,8 @@ nsBlockBandData::ClearFloaters(nscoord aY, PRUint8 aBreakType)
{
for (;;) {
// Update band information based on target Y before clearing.
GetAvailableSpace(aY);
mSpaceManager->GetBandData(aY, mSpace, *this);
ComputeAvailSpaceRect();
// Compute aYS as aY in space-manager "root" coordinates.
nscoord aYS = aY + mSpaceManagerY;

1
mozilla/layout/html/base/src/nsBlockBandData.h
View File

@@ -96,7 +96,6 @@ protected:
PRInt32 mLeftFloaters, mRightFloaters;
void ComputeAvailSpaceRect();
void GetAvailableSpace(nscoord aY);
PRBool ShouldClearFrame(nsIFrame* aFrame, PRUint8 aBreakType);
nscoord GetFrameYMost(nsIFrame* aFrame);
};