diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-06 18:28:49 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-06 19:03:54 +0000 |
| commit | a8f413927951e1b6e6c791526da3c92bc45639e2 (patch) | |
| tree | 507bbb54ad239fc5615a074a1db8be3cc5b12df8 /src/core | |
| parent | d05cdc310c1ff1183a3c350e02ff603a4e97c02e (diff) | |
Revert "Allow conversion from non-opaque to opaque"
This reverts commit bfe8dca7dfdd9cafbccba0a637f2fcd58c7a54fb.
Reason for revert: I believe I've fixed all the call sites,
so this is now ok.
Original change's description:
> 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>
>
TBR=msarett@google.com,robertphillips@google.com,reviews@skia.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I2369c9b81321ca83a7063bb85e66ddbc03914d2b
Reviewed-on: https://skia-review.googlesource.com/8073
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkImageInfoPriv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h index a79f2cb963..7fea296d38 100644 --- a/src/core/SkImageInfoPriv.h +++ b/src/core/SkImageInfoPriv.h @@ -68,10 +68,9 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm 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; - //} + if (kOpaque_SkAlphaType == dst.alphaType() && kOpaque_SkAlphaType != src.alphaType()) { + return false; + } return true; } |