From b7d7f148504d11f5ee4b26de854c7977edbbe61b Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Sat, 27 Mar 1999 01:20:46 +0000 Subject: [PATCH] Translate trapezoid into proper coordinate system git-svn-id: svn://10.0.0.236/trunk@25290 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockBandData.cpp | 12 ++---------- mozilla/layout/html/base/src/nsBlockBandData.cpp | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/mozilla/layout/generic/nsBlockBandData.cpp b/mozilla/layout/generic/nsBlockBandData.cpp index 9e59dcfbb57..fffb115ecde 100644 --- a/mozilla/layout/generic/nsBlockBandData.cpp +++ b/mozilla/layout/generic/nsBlockBandData.cpp @@ -285,21 +285,13 @@ nsBlockBandData::ClearFloaters(nscoord aY, PRUint8 aBreakType) for (fn = 0; fn < numFrames; fn++) { nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn); if (ShouldClearFrame(frame, aBreakType)) { -#if 0 - nscoord ym = GetFrameYMost(frame); -#else - nscoord ym = trapezoid->yBottom; -#endif + nscoord ym = trapezoid->yBottom + mSpaceManagerY; if (ym > yMost) yMost = ym; } } } else if (ShouldClearFrame(trapezoid->frame, aBreakType)) { -#if 0 - nscoord ym = GetFrameYMost(trapezoid->frame); -#else - nscoord ym = trapezoid->yBottom; -#endif + nscoord ym = trapezoid->yBottom + mSpaceManagerY; if (ym > yMost) yMost = ym; } } diff --git a/mozilla/layout/html/base/src/nsBlockBandData.cpp b/mozilla/layout/html/base/src/nsBlockBandData.cpp index 9e59dcfbb57..fffb115ecde 100644 --- a/mozilla/layout/html/base/src/nsBlockBandData.cpp +++ b/mozilla/layout/html/base/src/nsBlockBandData.cpp @@ -285,21 +285,13 @@ nsBlockBandData::ClearFloaters(nscoord aY, PRUint8 aBreakType) for (fn = 0; fn < numFrames; fn++) { nsIFrame* frame = (nsIFrame*) trapezoid->frames->ElementAt(fn); if (ShouldClearFrame(frame, aBreakType)) { -#if 0 - nscoord ym = GetFrameYMost(frame); -#else - nscoord ym = trapezoid->yBottom; -#endif + nscoord ym = trapezoid->yBottom + mSpaceManagerY; if (ym > yMost) yMost = ym; } } } else if (ShouldClearFrame(trapezoid->frame, aBreakType)) { -#if 0 - nscoord ym = GetFrameYMost(trapezoid->frame); -#else - nscoord ym = trapezoid->yBottom; -#endif + nscoord ym = trapezoid->yBottom + mSpaceManagerY; if (ym > yMost) yMost = ym; } }