From 94bd50cc5575b90eb60234399d69905b8651c27e Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Tue, 17 Jan 2017 13:57:45 -0500 Subject: [PATCH] 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 Commit-Queue: Matt Sarett --- src/core/SkImageInfoPriv.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h index 029aa93e1d..72138aebe4 100644 --- a/src/core/SkImageInfoPriv.h +++ b/src/core/SkImageInfoPriv.h @@ -69,11 +69,9 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm 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; }