Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1231256 (part 6) - Remove unused parameter from Damage functions. r=roc.

Browse Source 
--HG--
extra : rebase_source : 1c5bce4cde56ce7cd63aa719d9952bf72164e634
This commit is contained in:
Nicholas Nethercote 2015-12-07 15:23:34 -08:00
parent 0a1ca6ebfe
commit b05b423429
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsBlockFrame.cpp
View File

@ -1946,9 +1946,9 @@ nsBlockFrame::PropagateFloatDamage(nsBlockReflowState& aState,
nscoord lineBCoordCombinedAfter = lineBCoordCombinedBefore +
overflow.BSize(wm);
bool isDirty = floatManager->IntersectsDamage(wm, lineBCoordBefore,
bool isDirty = floatManager->IntersectsDamage(lineBCoordBefore,
lineBCoordAfter) ||
floatManager->IntersectsDamage(wm, lineBCoordCombinedBefore,
floatManager->IntersectsDamage(lineBCoordCombinedBefore,
lineBCoordCombinedAfter);
if (isDirty) {
aLine->MarkDirty();

2
layout/generic/nsBlockReflowState.cpp
View File

@ -998,7 +998,7 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
// shrunk.
nscoord blockStart = std::min(region.BStart(wm), oldRegion.BStart(wm));
nscoord blockEnd = std::max(region.BEnd(wm), oldRegion.BEnd(wm));
mFloatManager->IncludeInDamage(wm, blockStart, blockEnd);
mFloatManager->IncludeInDamage(blockStart, blockEnd);
}
if (!NS_FRAME_IS_FULLY_COMPLETE(reflowStatus)) {

6
layout/generic/nsFloatManager.h
View File

@ -224,15 +224,13 @@ public:
return !mFloatDamage.IsEmpty();
}
void IncludeInDamage(mozilla::WritingMode aWM,
nscoord aIntervalBegin, nscoord aIntervalEnd)
void IncludeInDamage(nscoord aIntervalBegin, nscoord aIntervalEnd)
{
mFloatDamage.IncludeInterval(aIntervalBegin + mBlockStart,
aIntervalEnd + mBlockStart);
}
bool IntersectsDamage(mozilla::WritingMode aWM,
nscoord aIntervalBegin, nscoord aIntervalEnd) const
bool IntersectsDamage(nscoord aIntervalBegin, nscoord aIntervalEnd) const
{
return mFloatDamage.Intersects(aIntervalBegin + mBlockStart,
aIntervalEnd + mBlockStart);