From bfe8dca7dfdd9cafbccba0a637f2fcd58c7a54fb Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Mon, 23 Jan 2017 09:41:08 -0500 Subject: Allow conversion from non-opaque to opaque BUG:683787 Change-Id: I1b78cc8d1b5d3917a2a952da036b93022e99e053 Reviewed-on: https://skia-review.googlesource.com/7374 Reviewed-by: Robert Phillips Commit-Queue: Matt Sarett --- src/core/SkImageInfoPriv.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h index af822e2e51..f04acc5484 100644 --- a/src/core/SkImageInfoPriv.h +++ b/src/core/SkImageInfoPriv.h @@ -68,9 +68,10 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm return false; } - if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) { - return false; - } + // TODO (msarett): This is diabled for crbug.com/683787. How should we handle this case? + //if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) { + // return false; + //} return true; } -- cgit v1.2.3