From a05d5c2081136b3dd59199b5ab410cc2e832c3d7 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 3 Feb 2016 15:04:37 +0100
Subject: [PATCH] Backed out changeset 63e2a056311a (bug 1187464) for reftest
 failures

---
 gfx/2d/Logging.h                     | 1 -
 gfx/layers/basic/BasicCompositor.cpp | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h
index ad5c3c6892a..11c3390f46e 100644
--- a/gfx/2d/Logging.h
+++ b/gfx/2d/Logging.h
@@ -131,7 +131,6 @@ enum class LogReason : int {
   GlyphAllocFailedCG,
   InvalidRect,
   CannotDraw3D, // 20
-  IncompatibleBasicTexturedEffect,
   // End
   MustBeLessThanThis = 101,
 };
diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index 05b92a614ea..8191d7190d4 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -430,14 +430,14 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect,
           static_cast<TexturedEffect*>(aEffectChain.mPrimaryEffect.get());
       TextureSourceBasic* source = texturedEffect->mTexture->AsSourceBasic();
 
-      if (source && texturedEffect->mPremultiplied) {
+      if (texturedEffect->mPremultiplied) {
           DrawSurfaceWithTextureCoords(dest, aRect,
                                        source->GetSurface(dest),
                                        texturedEffect->mTextureCoords,
                                        texturedEffect->mFilter,
                                        DrawOptions(aOpacity, blendMode),
                                        sourceMask, &maskTransform);
-      } else if (source) {
+      } else {
           RefPtr<DataSourceSurface> srcData = source->GetSurface(dest)->GetDataSurface();
 
           // Yes, we re-create the premultiplied data every time.
@@ -450,10 +450,7 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect,
                                        texturedEffect->mFilter,
                                        DrawOptions(aOpacity, blendMode),
                                        sourceMask, &maskTransform);
-      } else {
-        gfxDevCrash(LogReason::IncompatibleBasicTexturedEffect) << "Bad for basic";
       }
-
       break;
     }
     case EffectTypes::YCBCR: {