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

Bug 940845 - Part 3: Inline code into nsContextBoxBlur::BlurRectangle so that we don't have to create one on the stack. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2013-11-26 12:07:03 +13:00
parent 20050256f7
commit d0f9c81a1e
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
layout/base/nsCSSRendering.cpp
View File

@ -4818,16 +4818,55 @@ nsContextBoxBlur::BlurRectangle(gfxContext* aDestinationCtx,
const nsRect& aDirtyRect,
const gfxRect& aSkipRect)
{
nsContextBoxBlur blur;
gfxContext *dest = blur.Init(aRect, 0, aBlurRadius, aAppUnitsPerDevPixel,
aDestinationCtx, aDirtyRect, &aSkipRect);
if (!dest) {
if (aRect.IsEmpty()) {
return;
}
gfxFloat scaleX = 1;
gfxFloat scaleY = 1;
// Do blurs in device space when possible.
// Chrome/Skia always does the blurs in device space
// and will sometimes get incorrect results (e.g. rotated blurs)
gfxMatrix transform = aDestinationCtx->CurrentMatrix();
// XXX: we could probably handle negative scales but for now it's easier just to fallback
if (transform.HasNonAxisAlignedTransform() || transform.xx <= 0.0 || transform.yy <= 0.0) {
transform = gfxMatrix();
} else {
scaleX = transform.xx;
scaleY = transform.yy;
}
gfxRect shadowGfxRect =
nsLayoutUtils::RectToGfxRect(aRect, aAppUnitsPerDevPixel);
gfxIntSize blurRadius = ComputeBlurRadius(aBlurRadius, aAppUnitsPerDevPixel, scaleX, scaleY);
gfxAlphaBoxBlur blur;
gfxContext *dest;
bool preTransformed = false;
if (blurRadius.width <= 0 && blurRadius.height <= 0) {
dest = aDestinationCtx;
} else {
gfxRect dirtyRect =
nsLayoutUtils::RectToGfxRect(aDirtyRect, aAppUnitsPerDevPixel);
dirtyRect.RoundOut();
gfxRect rect = transform.TransformBounds(shadowGfxRect);
preTransformed = !transform.IsIdentity();
// Create the temporary surface for blurring
dirtyRect = transform.TransformBounds(dirtyRect);
gfxRect skipRect = transform.TransformBounds(aSkipRect);
dest = blur.Init(rect, gfxIntSize(), blurRadius, &dirtyRect, &skipRect);
if (!dest) {
return;
}
dest->SetMatrix(transform);
}
shadowGfxRect.Round();
aDestinationCtx->SetColor(aShadowColor);
@ -4840,5 +4879,12 @@ nsContextBoxBlur::BlurRectangle(gfxContext* aDestinationCtx,
}
dest->Fill();
blur.DoPaint();
if (dest == aDestinationCtx)
return;
if (preTransformed) {
aDestinationCtx->IdentityMatrix();
}
blur.Paint(aDestinationCtx);
}