Bug 1265625 - Remove workaround for fennec, r?jrmuizel draft
authorpeter chang <pchang@mozilla.com>
Tue, 10 May 2016 15:10:49 +0800
changeset 365186 3842edfbae37cb2f05de38120284451a2e81bada
parent 349268 29d5a4175c8b74f45482276a53985cf2568b4be2
child 365187 afb87b3b29fe4210faab931490d1c1978d7d2498
push id17660
push userbmo:howareyou322@gmail.com
push dateTue, 10 May 2016 07:12:23 +0000
reviewersjrmuizel
bugs1265625
milestone48.0a1
Bug 1265625 - Remove workaround for fennec, r?jrmuizel MozReview-Commit-ID: F3IeDPeJwo7
gfx/layers/opengl/CompositorOGL.cpp
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1237,28 +1237,16 @@ CompositorOGL::DrawQuad(const Rect& aRec
           static_cast<TexturedEffect*>(aEffectChain.mPrimaryEffect.get());
       TextureSource *source = texturedEffect->mTexture;
 
       didSetBlendMode = SetBlendMode(gl(), blendMode, texturedEffect->mPremultiplied);
 
       gfx::Filter filter = texturedEffect->mFilter;
       Matrix4x4 textureTransform = source->AsSourceOGL()->GetTextureTransform();
 
-#ifdef MOZ_WIDGET_ANDROID
-      gfx::Matrix textureTransform2D;
-      if (filter != gfx::Filter::POINT &&
-          aTransform.Is2DIntegerTranslation() &&
-          textureTransform.Is2D(&textureTransform2D) &&
-          textureTransform2D.HasOnlyIntegerTranslation()) {
-        // On Android we encounter small resampling errors in what should be
-        // pixel-aligned compositing operations. This works around them. This
-        // code should not be needed!
-        filter = gfx::Filter::POINT;
-      }
-#endif
       source->AsSourceOGL()->BindTexture(LOCAL_GL_TEXTURE0, filter);
 
       program->SetTextureUnit(0);
       program->SetTextureTransform(textureTransform);
 
       if (maskType != MaskType::MaskNone) {
         BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE1, maskQuadTransform);
       }