Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1540737 - Implement PushLayerWithBlend for DrawTargetCairo. r=jrmuizel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D114671
This commit is contained in:
Matt Woodrow 2021-05-19 01:11:30 +00:00
parent 6543cd468c
commit 7487e05b57
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/2d/DrawTargetCairo.cpp
View File

@ -1540,6 +1540,16 @@ void DrawTargetCairo::PushLayer(bool aOpaque, Float aOpacity,
SourceSurface* aMask,
const Matrix& aMaskTransform,
const IntRect& aBounds, bool aCopyBackground) {
PushLayerWithBlend(aOpaque, aOpacity, aMask, aMaskTransform, aBounds,
aCopyBackground, CompositionOp::OP_OVER);
}
void DrawTargetCairo::PushLayerWithBlend(bool aOpaque, Float aOpacity,
SourceSurface* aMask,
const Matrix& aMaskTransform,
const IntRect& aBounds,
bool aCopyBackground,
CompositionOp aCompositionOp) {
cairo_content_t content = CAIRO_CONTENT_COLOR_ALPHA;
if (mFormat == SurfaceFormat::A8) {
@ -1561,7 +1571,7 @@ void DrawTargetCairo::PushLayer(bool aOpaque, Float aOpacity,
cairo_push_group_with_content(mContext, content);
}
PushedLayer layer(aOpacity, mPermitSubpixelAA);
PushedLayer layer(aOpacity, aCompositionOp, mPermitSubpixelAA);
if (aMask) {
cairo_surface_t* surf = GetCairoSurfaceForSourceSurface(aMask);
@ -1595,6 +1605,7 @@ void DrawTargetCairo::PopLayer() {
mPushedLayers.pop_back();
if (!layer.mMaskPattern) {
cairo_set_operator(mContext, GfxOpToCairoOp(layer.mCompositionOp));
cairo_paint_with_alpha(mContext, layer.mOpacity);
} else {
if (layer.mOpacity != Float(1.0)) {
@ -1605,6 +1616,7 @@ void DrawTargetCairo::PopLayer() {
cairo_pop_group_to_source(mContext);
}
cairo_set_operator(mContext, GfxOpToCairoOp(layer.mCompositionOp));
cairo_mask(mContext, layer.mMaskPattern);
}
@ -1612,6 +1624,8 @@ void DrawTargetCairo::PopLayer() {
GfxMatrixToCairoMatrix(mTransform, mat);
cairo_set_matrix(mContext, &mat);
cairo_set_operator(mContext, CAIRO_OPERATOR_OVER);
cairo_pattern_destroy(layer.mMaskPattern);
SetPermitSubpixelAA(layer.mWasPermittingSubpixelAA);
}

10
gfx/2d/DrawTargetCairo.h
View File

@ -131,6 +131,11 @@ class DrawTargetCairo final : public DrawTarget {
const Matrix& aMaskTransform,
const IntRect& aBounds = IntRect(),
bool aCopyBackground = false) override;
virtual void PushLayerWithBlend(
bool aOpaque, Float aOpacity, SourceSurface* aMask,
const Matrix& aMaskTransform, const IntRect& aBounds = IntRect(),
bool aCopyBackground = false,
CompositionOp = CompositionOp::OP_OVER) override;
virtual void PopLayer() override;
virtual already_AddRefed<PathBuilder> CreatePathBuilder(
@ -220,11 +225,14 @@ class DrawTargetCairo final : public DrawTarget {
cairo_font_options_t* mFontOptions;
struct PushedLayer {
PushedLayer(Float aOpacity, bool aWasPermittingSubpixelAA)
PushedLayer(Float aOpacity, CompositionOp aCompositionOp,
bool aWasPermittingSubpixelAA)
: mOpacity(aOpacity),
mCompositionOp(aCompositionOp),
mMaskPattern(nullptr),
mWasPermittingSubpixelAA(aWasPermittingSubpixelAA) {}
Float mOpacity;
CompositionOp mCompositionOp;
cairo_pattern_t* mMaskPattern;
bool mWasPermittingSubpixelAA;
};