commit 9c37cd96e4c8158643dbde6fd3eda1b42e267bec
author Brian Osman <brianosman@google.com> Thu Oct 11 12:57:44 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 11 12:57:52 2018 +0000
tree a7cb840d5af1d7ae17d799513ed7d6a82380e754
parent 932759e9b414367f81d5b3ed23b25e6799fe5d87

Revert "Fix image info checking for always-opaque color types"

This reverts commit 9835dd51b320271bd0347cd6a71d7ee27c40ede7.

Reason for revert: Chrome unit tests failing?

Original change's description:
> Fix image info checking for always-opaque color types
> 
> The old code overlooked 101010x and 888x. The GPU code for
> readPixels tried to enfore this, but incorrectly, and the
> writePixels code missed it entirely.
> 
> Bug: skia:
> Change-Id: Ib69473703f2ae7604d4b21ec6728b7d764becd9a
> Reviewed-on: https://skia-review.googlesource.com/c/161148
> Commit-Queue: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Auto-Submit: Brian Osman <brianosman@google.com>

TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com

Change-Id: I360375f2bf21576db914f5e177ac56e398ca7023
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/161380
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

include/private/SkImageInfoPriv.h

diff --git a/include/private/SkImageInfoPriv.h b/include/private/SkImageInfoPriv.h
index a91e065..aad9e79 100644
--- a/include/private/SkImageInfoPriv.h
+++ b/include/private/SkImageInfoPriv.h
@@ -106,7 +106,8 @@
         return false;
     }
 
-    if (kOpaque_SkAlphaType != info.alphaType() && SkColorTypeIsAlwaysOpaque(info.colorType())) {
+    if (kOpaque_SkAlphaType != info.alphaType() &&
+       (kRGB_565_SkColorType == info.colorType() || kGray_8_SkColorType == info.colorType())) {
         return false;
     }
 

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 488a364..b29454c 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -565,9 +565,7 @@
         if (kUnknown_SkColorType == srcSkColorType || kUnknown_SkColorType == dstSkColorType) {
             return false;
         }
-        auto srcAlphaType = SkColorTypeIsAlwaysOpaque(srcSkColorType)
-            ? kOpaque_SkAlphaType
-            : (premul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType);
+        auto srcAlphaType = premul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
         SkPixmap src(SkImageInfo::Make(width, height, srcSkColorType, srcAlphaType,
                                        sk_ref_sp(srcColorSpace)),
                      buffer, rowBytes);
@@ -748,7 +746,7 @@
         auto tempII = SkImageInfo::Make(width, height, srcSkColorType, tempAT,
                                         src->colorSpaceInfo().refColorSpace());
         SkASSERT(!unpremul || !SkColorTypeIsAlwaysOpaque(dstSkColorType));
-        auto finalAT = SkColorTypeIsAlwaysOpaque(dstSkColorType)
+        auto finalAT = SkColorTypeIsAlwaysOpaque(srcSkColorType)
                                ? kOpaque_SkAlphaType
                                : unpremul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
         auto finalII =