From 679745ac84869bf9d79424f6afdb0359626d68fc Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Wed, 12 Oct 2016 13:01:19 +0800 Subject: [PATCH] Bug 1309467 Part 1 - Rename aBOffset to aBCoord in nsFloatManager::GetFlowArea(). r=dbaron The header file and its documentation uses |aBCoord| so I change the implementation for consistency. MozReview-Commit-ID: 99mEUgUwcBV --HG-- extra : rebase_source : 3ead203f6a325b26d96b2728ff28af74784effd7 --- layout/generic/nsFloatManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/generic/nsFloatManager.cpp b/layout/generic/nsFloatManager.cpp index 2c0ff1f38fcb..39ef9bd3c09c 100644 --- a/layout/generic/nsFloatManager.cpp +++ b/layout/generic/nsFloatManager.cpp @@ -121,7 +121,7 @@ void nsFloatManager::Shutdown() "incompatible writing modes") nsFlowAreaRect -nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset, +nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBCoord, BandInfoType aInfoType, nscoord aBSize, LogicalRect aContentArea, SavedState* aState, const nsSize& aContainerSize) const @@ -131,7 +131,7 @@ nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset, NS_ASSERTION(aContentArea.ISize(aWM) >= 0, "unexpected content area inline size"); - nscoord blockStart = aBOffset + mBlockStart; + nscoord blockStart = aBCoord + mBlockStart; if (blockStart < nscoord_MIN) { NS_WARNING("bad value"); blockStart = nscoord_MIN; @@ -153,7 +153,7 @@ nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset, if (floatCount == 0 || (mFloats[floatCount-1].mLeftBEnd <= blockStart && mFloats[floatCount-1].mRightBEnd <= blockStart)) { - return nsFlowAreaRect(aWM, aContentArea.IStart(aWM), aBOffset, + return nsFlowAreaRect(aWM, aContentArea.IStart(aWM), aBCoord, aContentArea.ISize(aWM), aBSize, false); }