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
This commit is contained in:
@@ -121,7 +121,7 @@ void nsFloatManager::Shutdown()
|
|||||||
"incompatible writing modes")
|
"incompatible writing modes")
|
||||||
|
|
||||||
nsFlowAreaRect
|
nsFlowAreaRect
|
||||||
nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset,
|
nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBCoord,
|
||||||
BandInfoType aInfoType, nscoord aBSize,
|
BandInfoType aInfoType, nscoord aBSize,
|
||||||
LogicalRect aContentArea, SavedState* aState,
|
LogicalRect aContentArea, SavedState* aState,
|
||||||
const nsSize& aContainerSize) const
|
const nsSize& aContainerSize) const
|
||||||
@@ -131,7 +131,7 @@ nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset,
|
|||||||
NS_ASSERTION(aContentArea.ISize(aWM) >= 0,
|
NS_ASSERTION(aContentArea.ISize(aWM) >= 0,
|
||||||
"unexpected content area inline size");
|
"unexpected content area inline size");
|
||||||
|
|
||||||
nscoord blockStart = aBOffset + mBlockStart;
|
nscoord blockStart = aBCoord + mBlockStart;
|
||||||
if (blockStart < nscoord_MIN) {
|
if (blockStart < nscoord_MIN) {
|
||||||
NS_WARNING("bad value");
|
NS_WARNING("bad value");
|
||||||
blockStart = nscoord_MIN;
|
blockStart = nscoord_MIN;
|
||||||
@@ -153,7 +153,7 @@ nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset,
|
|||||||
if (floatCount == 0 ||
|
if (floatCount == 0 ||
|
||||||
(mFloats[floatCount-1].mLeftBEnd <= blockStart &&
|
(mFloats[floatCount-1].mLeftBEnd <= blockStart &&
|
||||||
mFloats[floatCount-1].mRightBEnd <= 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);
|
aContentArea.ISize(aWM), aBSize, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user