Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1416540 - Avoid unnecessary use of double-based types in GenerateAndPushTextMask. r=jfkthame

Browse Source 
The code here feeds into gfxContext::mTransform which is float-based, so
using double-based rects and matrices here is unnecessary.

MozReview-Commit-ID: CbeMM8003DA

--HG--
extra : rebase_source : 735d5c880cca36b9e9bea6cb0c94825b6a1c4597
This commit is contained in:
Kartikaya Gupta 2017-11-12 18:37:32 -05:00
parent 403cc2c37a
commit 2c46265720
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/painting/nsDisplayList.cpp
View File

@ -764,14 +764,14 @@ GenerateAndPushTextMask(nsIFrame* aFrame, gfxContext* aContext,
// background, one for generating text mask.
gfxContext* sourceCtx = aContext;
gfxRect bounds =
nsLayoutUtils::RectToGfxRect(aFillRect,
aFrame->PresContext()->AppUnitsPerDevPixel());
LayoutDeviceRect bounds =
LayoutDeviceRect::FromAppUnits(aFillRect,
aFrame->PresContext()->AppUnitsPerDevPixel());
{
// Paint text selection background into sourceCtx.
gfxContextMatrixAutoSaveRestore save(sourceCtx);
sourceCtx->SetMatrixDouble(sourceCtx->CurrentMatrixDouble().PreTranslate(bounds.TopLeft()));
sourceCtx->SetMatrix(sourceCtx->CurrentMatrix().PreTranslate(bounds.TopLeft().ToUnknownPoint()));
nsLayoutUtils::PaintFrame(aContext, aFrame,
nsRect(nsPoint(0, 0), aFrame->GetSize()),
@ -793,10 +793,10 @@ GenerateAndPushTextMask(nsIFrame* aFrame, gfxContext* aContext,
}
RefPtr<gfxContext> maskCtx = gfxContext::CreatePreservingTransformOrNull(maskDT);
MOZ_ASSERT(maskCtx);
gfxMatrix currentMatrix = sourceCtx->CurrentMatrixDouble();
maskCtx->SetMatrixDouble(gfxMatrix::Translation(bounds.TopLeft()) *
currentMatrix *
gfxMatrix::Translation(-drawRect.TopLeft()));
Matrix currentMatrix = sourceCtx->CurrentMatrix();
maskCtx->SetMatrix(Matrix::Translation(bounds.TopLeft().ToUnknownPoint()) *
currentMatrix *
Matrix::Translation(-drawRect.TopLeft()));
// Shade text shape into mask A8 surface.
nsLayoutUtils::PaintFrame(maskCtx, aFrame,
@ -806,7 +806,7 @@ GenerateAndPushTextMask(nsIFrame* aFrame, gfxContext* aContext,
// Push the generated mask into aContext, so that the caller can pop and
// blend with it.
Matrix maskTransform = ToMatrix(currentMatrix) *
Matrix maskTransform = currentMatrix *
Matrix::Translation(-drawRect.x, -drawRect.y);
maskTransform.Invert();