commit 94bd50cc5575b90eb60234399d69905b8651c27e
author Matt Sarett <msarett@google.com> Tue Jan 17 13:57:45 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 17 19:35:18 2017 +0000
tree f25aa2e00b100f0caeb80baa094085c53401ae2a
parent 844685434855c51e310884be9ec8e8b3f563033e

SkImageInfoValidConversion (part 2)

Disabling non-opaque -> opaque should be fine now that the
Chrome unit test has been fixed.

BUG=skia:6021

Change-Id: I39f087e2695bdefacf793bd137931e3115ec58cb
Reviewed-on: https://skia-review.googlesource.com/7121
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

src/core/SkImageInfoPriv.h

diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index 029aa93..72138ae 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -69,11 +69,9 @@
         return false;
     }
 
-    // FIXME (msarett): This is commented out until a fix to Chrome's gfx_unittest lands.
-    // In those tests, they write kPremul pixels to a kOpaque canvas.
-    //if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
-    //    return false;
-    //}
+    if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) {
+        return false;
+    }
 
     return true;
 }