From 7665cddbabefb249e5fe6c39224175cf2d852021 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Tue, 15 Apr 2003 03:10:50 +0000 Subject: [PATCH] Correct translation when ensuring floats are never higher than prior floats. b=201985 r+sr=roc git-svn-id: svn://10.0.0.236/trunk@141157 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockReflowState.cpp | 2 +- mozilla/layout/html/base/src/nsBlockReflowState.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 2e41bb8d0c0..e4e737858da 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -870,7 +870,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache, // Enforce CSS2 9.5.1 rule [2], i.e., make sure that a float isn't // ``above'' another float that preceded it in the flow. - mY = NS_MAX(mSpaceManager->GetLowestRegionTop(), mY); + mY = NS_MAX(mSpaceManager->GetLowestRegionTop() + BorderPadding().top, mY); // See if the floater should clear any preceeding floaters... if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 2e41bb8d0c0..e4e737858da 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -870,7 +870,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache, // Enforce CSS2 9.5.1 rule [2], i.e., make sure that a float isn't // ``above'' another float that preceded it in the flow. - mY = NS_MAX(mSpaceManager->GetLowestRegionTop(), mY); + mY = NS_MAX(mSpaceManager->GetLowestRegionTop() + BorderPadding().top, mY); // See if the floater should clear any preceeding floaters... if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {