commit ea518f0a7eaeb3f2efc4c106f75c8a2d4c37f2b9
author Matt Sarett <msarett@google.com> Fri Feb 03 11:58:59 2017 -0800
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 03 20:31:55 2017 +0000
tree 3f9fc711fe56de632c07f6fbf3e0e2153c686941
parent e0b048cd1d9772847d6f08bccb5b85133a41fc98

Disable unpremul f16 image tests

Testing premul f16 is enough test coverage, and we aren't doing
this correctly right now anyways (the drawing code assumes a
premul bitmap, we would need to premultiply after the unpremul
decode).

BUG=skia:

Change-Id: I798f56db67faadd0348974453a05cd726b9a509c
Reviewed-on: https://skia-review.googlesource.com/8020
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index ae34f90..16ec5ca 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -366,6 +366,11 @@
             }
 
             if (kRGBA_F16_SkColorType == canvasColorType) {
+                if (kUnpremul_SkAlphaType == dstAlphaType) {
+                    // Testing kPremul is enough for adequate coverage of F16 decoding.
+                    return false;
+                }
+
                 sk_sp<SkColorSpace> linearSpace =
                         as_CSB(decodeInfo->colorSpace())->makeLinearGamma();
                 *decodeInfo = decodeInfo->makeColorSpace(std::move(linearSpace));
@@ -404,7 +409,7 @@
     SkImageInfo decodeInfo = codec->getInfo();
     if (!get_decode_info(&decodeInfo, canvas->imageInfo().colorType(), fDstColorType,
                          fDstAlphaType)) {
-        return Error::Nonfatal("Testing non-565 to 565 is uninteresting.");
+        return Error::Nonfatal("Skipping uninteresting test.");
     }
 
     // Try to scale the image if it is desired
@@ -799,7 +804,7 @@
     SkImageInfo decodeInfo = codec->getInfo();
     if (!get_decode_info(&decodeInfo, canvas->imageInfo().colorType(), fDstColorType,
                          fDstAlphaType)) {
-        return Error::Nonfatal("Testing non-565 to 565 is uninteresting.");
+        return Error::Nonfatal("Skipping uninteresting test.");
     }
 
     // Scale the image if it is desired.