From 4bec7a8874b12ac3c29f8aa081e7b3634b684a0f Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com" <kipp%netscape.com>
Date: Sat, 27 Mar 1999 01:20:46 +0000
Subject: [PATCH] Translate trapezoid into proper coordinate system

---
 layout/generic/nsBlockBandData.cpp       | 12 ++----------
 layout/html/base/src/nsBlockBandData.cpp | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/layout/generic/nsBlockBandData.cpp b/layout/generic/nsBlockBandData.cpp
index 9e59dcfbb575..fffb115ecde0 100644
--- a/layout/generic/nsBlockBandData.cpp
+++ b/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/layout/html/base/src/nsBlockBandData.cpp b/layout/html/base/src/nsBlockBandData.cpp
index 9e59dcfbb575..fffb115ecde0 100644
--- a/layout/html/base/src/nsBlockBandData.cpp
+++ b/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;
         }
       }