wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 779029: Try to respect EXTEND_NONE when masking. r=jrmuizel

Browse Source
This commit is contained in:
Bas Schouten 2012-11-16 00:30:08 +00:00
parent 63d4eb8c47
commit 4a93ce1d26
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/thebes/gfxContext.cpp
View File

@ -1402,7 +1402,28 @@ gfxContext::Mask(gfxPattern *pattern)
if (mCairo) {
cairo_mask(mCairo, pattern->CairoPattern());
} else {
bool needsClip = false;
if (pattern->GetType() == gfxPattern::PATTERN_SURFACE &&
pattern->Extend() == gfxPattern::EXTEND_NONE) {
// In this situation the mask will be fully transparent (i.e. nothing
// will be drawn) outside of the bounds of the surface. We can support
// that by clipping out drawing to that area.
needsClip = true;
nsRefPtr<gfxASurface> surf = pattern->GetSurface();
gfxPoint offset = surf->GetDeviceOffset();
Matrix mat = ToMatrix(pattern->GetMatrix());
mat.Invert();
mat = GetDTTransform() * mat;
mDT->SetTransform(mat);
mDT->PushClipRect(Rect(offset.x, offset.y, surf->GetSize().width, surf->GetSize().height));
mDT->SetTransform(GetDTTransform());
}
mDT->Mask(GeneralPattern(this), *pattern->GetPattern(mDT), DrawOptions(1.0f, CurrentState().op, CurrentState().aaMode));
if (needsClip) {
mDT->PopClip();
}
}
}
@ -1418,10 +1439,14 @@ gfxContext::Mask(gfxASurface *surface, const gfxPoint& offset)
gfxPlatform::GetPlatform()->GetSourceSurfaceForSurface(mDT, surface);
gfxPoint pt = surface->GetDeviceOffset();
// We clip here to bind to the mask surface bounds, see above.
mDT->PushClipRect(Rect(offset.x, offset.y, sourceSurf->GetSize().width, sourceSurf->GetSize().height));
mDT->Mask(GeneralPattern(this),
SurfacePattern(sourceSurf, EXTEND_CLAMP,
Matrix(1.0f, 0, 0, 1.0f, Float(offset.x - pt.x), Float(offset.y - pt.y))),
DrawOptions(1.0f, CurrentState().op, CurrentState().aaMode));
mDT->PopClip();
}
}