diff options
| author |  Matt Sarett <msarett@google.com> | 2017-01-23 09:41:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 15:47:42 +0000 |
| commit | bfe8dca7dfdd9cafbccba0a637f2fcd58c7a54fb (patch) | |
| tree | e786d1b361ea40f13c5558844a75c7915c6e2f76 /src | |
| parent | 59d5a0e3f560da40e0ae7036a01d7d58ce3718d8 (diff) | |
Allow conversion from non-opaque to opaque
BUG:683787
Change-Id: I1b78cc8d1b5d3917a2a952da036b93022e99e053
Reviewed-on: https://skia-review.googlesource.com/7374
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkImageInfoPriv.h | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |