From d35c527b82ec66fbd2b4d7e503b20a733af342ef Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Mon, 10 Feb 2014 18:45:11 -0800 Subject: [PATCH] Bug 970711 - Make basic compositor respect TexturedEffect filter (r=mattwoodrow) --- gfx/layers/basic/BasicCompositor.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp index e4210e7f3475..4e933f723987 100644 --- a/gfx/layers/basic/BasicCompositor.cpp +++ b/gfx/layers/basic/BasicCompositor.cpp @@ -293,6 +293,7 @@ DrawSurfaceWithTextureCoords(DrawTarget *aDest, const gfx::Rect& aDestRect, SourceSurface *aSource, const gfx::Rect& aTextureCoords, + gfx::Filter aFilter, float aOpacity, SourceSurface *aMask, const Matrix& aMaskTransform) @@ -316,13 +317,13 @@ DrawSurfaceWithTextureCoords(DrawTarget *aDest, Matrix dtTransform = aDest->GetTransform(); aDest->SetTransform(aMaskTransform); Matrix patternMatrix = maskTransformInverse * dtTransform * matrix; - aDest->MaskSurface(SurfacePattern(aSource, ExtendMode::REPEAT, patternMatrix), + aDest->MaskSurface(SurfacePattern(aSource, ExtendMode::REPEAT, patternMatrix, aFilter), aMask, Point(), DrawOptions(aOpacity)); aDest->SetTransform(dtTransform); aDest->PopClip(); } else { aDest->FillRect(aDestRect, - SurfacePattern(aSource, ExtendMode::REPEAT, matrix), + SurfacePattern(aSource, ExtendMode::REPEAT, matrix, aFilter), DrawOptions(aOpacity)); } } @@ -487,6 +488,7 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect, DrawSurfaceWithTextureCoords(dest, aRect, source->GetSurface(), texturedEffect->mTextureCoords, + texturedEffect->mFilter, aOpacity, sourceMask, maskTransform); break; } @@ -504,6 +506,7 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect, DrawSurfaceWithTextureCoords(dest, aRect, sourceSurf, effectRenderTarget->mTextureCoords, + effectRenderTarget->mFilter, aOpacity, sourceMask, maskTransform); break; }