зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1392523. Remove duplicated gfxContext* parameter. r=mattwoodrow
All of the callers are passing in the same value for both gfxContexts.
This commit is contained in:
Родитель
38624ed0af
Коммит
d5f9b84940
|
@ -5972,14 +5972,13 @@ void
|
|||
FrameLayerBuilder::PaintItems(nsTArray<ClippedDisplayItem>& aItems,
|
||||
const nsIntRect& aRect,
|
||||
gfxContext *aContext,
|
||||
gfxContext *aRC,
|
||||
nsDisplayListBuilder* aBuilder,
|
||||
nsPresContext* aPresContext,
|
||||
const nsIntPoint& aOffset,
|
||||
float aXScale, float aYScale,
|
||||
int32_t aCommonClipCount)
|
||||
{
|
||||
DrawTarget& aDrawTarget = *aRC->GetDrawTarget();
|
||||
DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
|
||||
|
||||
int32_t appUnitsPerDevPixel = aPresContext->AppUnitsPerDevPixel();
|
||||
nsRect boundRect = ToAppUnits(aRect, appUnitsPerDevPixel);
|
||||
|
@ -6032,7 +6031,7 @@ FrameLayerBuilder::PaintItems(nsTArray<ClippedDisplayItem>& aItems,
|
|||
|
||||
if (cdi->mInactiveLayerManager) {
|
||||
bool saved = aDrawTarget.GetPermitSubpixelAA();
|
||||
PaintInactiveLayer(aBuilder, cdi->mInactiveLayerManager, cdi->mItem, aContext, aRC);
|
||||
PaintInactiveLayer(aBuilder, cdi->mInactiveLayerManager, cdi->mItem, aContext, aContext);
|
||||
aDrawTarget.SetPermitSubpixelAA(saved);
|
||||
} else {
|
||||
nsIFrame* frame = cdi->mItem->Frame();
|
||||
|
@ -6045,7 +6044,7 @@ FrameLayerBuilder::PaintItems(nsTArray<ClippedDisplayItem>& aItems,
|
|||
} else
|
||||
#endif
|
||||
{
|
||||
cdi->mItem->Paint(aBuilder, aRC);
|
||||
cdi->mItem->Paint(aBuilder, aContext);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6201,7 +6200,7 @@ FrameLayerBuilder::DrawPaintedLayer(PaintedLayer* aLayer,
|
|||
aContext->CurrentMatrix().PreTranslate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y)).
|
||||
PreScale(userData->mXScale, userData->mYScale));
|
||||
|
||||
layerBuilder->PaintItems(entry->mItems, iterRect, aContext, aContext,
|
||||
layerBuilder->PaintItems(entry->mItems, iterRect, aContext,
|
||||
builder, presContext,
|
||||
offset, userData->mXScale, userData->mYScale,
|
||||
entry->mCommonClipCount);
|
||||
|
@ -6217,7 +6216,7 @@ FrameLayerBuilder::DrawPaintedLayer(PaintedLayer* aLayer,
|
|||
aContext->CurrentMatrix().PreTranslate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y)).
|
||||
PreScale(userData->mXScale,userData->mYScale));
|
||||
|
||||
layerBuilder->PaintItems(entry->mItems, aRegionToDraw.GetBounds(), aContext, aContext,
|
||||
layerBuilder->PaintItems(entry->mItems, aRegionToDraw.GetBounds(), aContext,
|
||||
builder, presContext,
|
||||
offset, userData->mXScale, userData->mYScale,
|
||||
entry->mCommonClipCount);
|
||||
|
|
|
@ -674,7 +674,6 @@ protected:
|
|||
void PaintItems(nsTArray<ClippedDisplayItem>& aItems,
|
||||
const nsIntRect& aRect,
|
||||
gfxContext* aContext,
|
||||
gfxContext* aRC,
|
||||
nsDisplayListBuilder* aBuilder,
|
||||
nsPresContext* aPresContext,
|
||||
const nsIntPoint& aOffset,
|
||||
|
|
Загрузка…
Ссылка в новой задаче