Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1372458 - Fold opacity into filter drawing rather than using a temporary surface. r=bas,mstange

Browse Source 
MozReview-Commit-ID: GOBTUhN7fcC

--HG--
extra : rebase_source : 8355d2001dcc8fba5e43d4ace6483896a9d9cd31
This commit is contained in:
Matt Woodrow 2018-07-14 15:25:49 +12:00
parent 4f18c0f4a2
commit 9171c79a67
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/2d/DrawTargetD2D1.cpp
View File

@ -255,7 +255,24 @@ DrawTargetD2D1::DrawFilter(FilterNode *aNode,
FilterNodeD2D1* node = static_cast<FilterNodeD2D1*>(aNode);
node->WillDraw(this);
mDC->DrawImage(node->OutputEffect(), D2DPoint(aDestPoint), D2DRect(aSourceRect));
if (aOptions.mAlpha == 1.0f) {
mDC->DrawImage(node->OutputEffect(), D2DPoint(aDestPoint), D2DRect(aSourceRect));
} else {
RefPtr<ID2D1Image> image;
node->OutputEffect()->GetOutput(getter_AddRefs(image));
Matrix mat = Matrix::Translation(aDestPoint);
RefPtr<ID2D1ImageBrush> imageBrush;
mDC->CreateImageBrush(image,
D2D1::ImageBrushProperties(D2DRect(aSourceRect)),
D2D1::BrushProperties(aOptions.mAlpha, D2DMatrix(mat)),
getter_AddRefs(imageBrush));
mDC->FillRectangle(D2D1::RectF(aDestPoint.x, aDestPoint.y,
aDestPoint.x + aSourceRect.width,
aDestPoint.y + aSourceRect.height),
imageBrush);
}
FinalizeDrawing(aOptions.mCompositionOp, ColorPattern(Color()));
}

9
layout/svg/nsFilterInstance.cpp
View File

@ -65,7 +65,8 @@ nsFilterInstance::PaintFilteredFrame(nsIFrame *aFilteredFrame,
gfxContext* aCtx,
nsSVGFilterPaintCallback *aPaintCallback,
const nsRegion *aDirtyArea,
imgDrawingParams& aImgParams)
imgDrawingParams& aImgParams,
float aOpacity)
{
auto& filterChain = aFilteredFrame->StyleEffects()->mFilters;
UniquePtr<UserSpaceMetrics> metrics = UserSpaceMetricsForFrame(aFilteredFrame);
@ -97,7 +98,7 @@ nsFilterInstance::PaintFilteredFrame(nsIFrame *aFilteredFrame,
aPaintCallback, scaleMatrixInDevUnits,
aDirtyArea, nullptr, nullptr, nullptr);
if (instance.IsInitialized()) {
instance.Render(aCtx, aImgParams);
instance.Render(aCtx, aImgParams, aOpacity);
}
}
@ -493,7 +494,7 @@ nsFilterInstance::BuildSourceImage(DrawTarget *aDest, imgDrawingParams& aImgPara
}
void
nsFilterInstance::Render(gfxContext* aCtx, imgDrawingParams& aImgParams)
nsFilterInstance::Render(gfxContext* aCtx, imgDrawingParams& aImgParams, float aOpacity)
{
MOZ_ASSERT(mTargetFrame, "Need a frame for rendering");
@ -521,7 +522,7 @@ nsFilterInstance::Render(gfxContext* aCtx, imgDrawingParams& aImgParams)
mSourceGraphic.mSourceSurface, mSourceGraphic.mSurfaceRect,
mFillPaint.mSourceSurface, mFillPaint.mSurfaceRect,
mStrokePaint.mSourceSurface, mStrokePaint.mSurfaceRect,
mInputImages, Point(0, 0));
mInputImages, Point(0, 0), DrawOptions(aOpacity));
}
nsRegion

5
layout/svg/nsFilterInstance.h
View File

@ -88,7 +88,8 @@ public:
gfxContext* aCtx,
nsSVGFilterPaintCallback *aPaintCallback,
const nsRegion* aDirtyArea,
imgDrawingParams& aImgParams);
imgDrawingParams& aImgParams,
float aOpacity = 1.0f);
/**
* Returns the post-filter area that could be dirtied when the given
@ -168,7 +169,7 @@ private:
* by passing it as the aPostFilterDirtyRegion argument to the
* nsFilterInstance constructor.
*/
void Render(gfxContext* aCtx, imgDrawingParams& aImgParams);
void Render(gfxContext* aCtx, imgDrawingParams& aImgParams, float aOpacity = 1.0f);
const FilterDescription& ExtractDescriptionAndAdditionalImages(nsTArray<RefPtr<SourceSurface>>& aOutAdditionalImages)
{

11
layout/svg/nsSVGIntegrationUtils.cpp
View File

@ -1089,22 +1089,13 @@ nsSVGIntegrationUtils::PaintFilter(const PaintFramesParams& aParams)
gfxContextAutoSaveRestore autoSR(&context);
EffectOffsets offsets = MoveContextOriginToUserSpace(firstFrame, aParams);
if (opacity != 1.0f) {
context.PushGroupForBlendBack(gfxContentType::COLOR_ALPHA, opacity,
nullptr, Matrix());
}
/* Paint the child and apply filters */
RegularFramePaintCallback callback(aParams.builder, aParams.layerManager,
offsets.offsetToUserSpaceInDevPx);
nsRegion dirtyRegion = aParams.dirtyRect - offsets.offsetToBoundingBox;
nsFilterInstance::PaintFilteredFrame(frame, &context, &callback,
&dirtyRegion, aParams.imgParams);
if (opacity != 1.0f) {
context.PopGroupAndBlend();
}
&dirtyRegion, aParams.imgParams, opacity);
}
class PaintFrameCallback : public gfxDrawingCallback {