diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index a3e744d41b2..66bc509307c 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -85,8 +85,11 @@ public: PRBool PlaceBelowCurrentLineFloaters(nsFloaterCacheList& aFloaters); + // called when clearing a line with a break type caused by a BR past + // floats, and also used internally by ClearPastFloaters void ClearFloaters(nscoord aY, PRUint8 aBreakType); + // called when clearing a block past floats PRBool ClearPastFloaters(PRUint8 aBreakType); PRBool IsAdjacentWithTop() const { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index a3e744d41b2..66bc509307c 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -85,8 +85,11 @@ public: PRBool PlaceBelowCurrentLineFloaters(nsFloaterCacheList& aFloaters); + // called when clearing a line with a break type caused by a BR past + // floats, and also used internally by ClearPastFloaters void ClearFloaters(nscoord aY, PRUint8 aBreakType); + // called when clearing a block past floats PRBool ClearPastFloaters(PRUint8 aBreakType); PRBool IsAdjacentWithTop() const {