wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicholas Nethercote 2015-12-07 15:23:34 -08:00
parent 07b6729952
commit fbe6ee2df0
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 + nscoord lineBCoordCombinedAfter = lineBCoordCombinedBefore +
overflow.BSize(wm); overflow.BSize(wm);
bool isDirty = floatManager->IntersectsDamage(wm, lineBCoordBefore, bool isDirty = floatManager->IntersectsDamage(lineBCoordBefore,
lineBCoordAfter) || lineBCoordAfter) ||
floatManager->IntersectsDamage(wm, lineBCoordCombinedBefore, floatManager->IntersectsDamage(lineBCoordCombinedBefore,
lineBCoordCombinedAfter); lineBCoordCombinedAfter);
if (isDirty) { if (isDirty) {
aLine->MarkDirty(); aLine->MarkDirty();

2
layout/generic/nsBlockReflowState.cpp
View File

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

6
layout/generic/nsFloatManager.h
View File

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