Create a separate src for colorspace tests

This will allow me to run these tests in sRGB mode, while
leaving most of the image tests disabled.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206953006

Review-Url: https://codereview.chromium.org/2206953006

19 files changed, 27 insertions, 7 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index fcc3c552ea..bf80c863ba 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -763,22 +763,22 @@ static bool gather_srcs() {
     for (auto colorImage : colorImages) {
         ColorCodecSrc* src = new ColorCodecSrc(colorImage, ColorCodecSrc::kBaseline_Mode,
                                                kN32_SkColorType);
-        push_src("image", "color_codec_baseline", src);
+        push_src("colorImage", "color_codec_baseline", src);
 
         src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_HPZR30w_Mode, kN32_SkColorType);
-        push_src("image", "color_codec_HPZR30w", src);
+        push_src("colorImage", "color_codec_HPZR30w", src);
         // TODO (msarett):
         // Should we test this Dst in F16 mode (even though the Dst gamma is 2.2 instead of sRGB)?
 
         src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_sRGB_Mode, kN32_SkColorType);
-        push_src("image", "color_codec_sRGB_kN32", src);
+        push_src("colorImage", "color_codec_sRGB_kN32", src);
         src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_sRGB_Mode, kRGBA_F16_SkColorType);
-        push_src("image", "color_codec_sRGB_kF16", src);
+        push_src("colorImage", "color_codec_sRGB_kF16", src);
 
 #if defined(SK_TEST_QCMS)
         src = new ColorCodecSrc(colorImage, ColorCodecSrc::kQCMS_HPZR30w_Mode,
                                 kRGBA_8888_SkColorType);
-        push_src("image", "color_codec_QCMS_HPZR30w", src);
+        push_src("colorImage", "color_codec_QCMS_HPZR30w", src);
 #endif
     }
 
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py
index 092c3e62b7..632cb20f34 100644
--- a/infra/bots/recipe_modules/vars/api.py
+++ b/infra/bots/recipe_modules/vars/api.py
@@ -315,7 +315,7 @@ def dm_flags(bot):
   args.extend(configs)
 
   # Run tests, gms, and image decoding tests everywhere.
-  args.extend('--src tests gm image'.split(' '))
+  args.extend('--src tests gm image colorImage'.split(' '))
 
   if 'GalaxyS' in bot:
     args.extend(('--threads', '0'))
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
index f29ee87b9c..4c01eb5fd8 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
@@ -426,6 +426,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--threads",
       "0",
       "--blacklist",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
index 7ed4b3e99e..32e7e2ab7b 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
@@ -525,6 +525,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index a2ec57b3aa..60d906fa78 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -161,6 +161,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 30ddf87598..61abb83fca 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -97,6 +97,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index efe9a753c6..3efaa4e7b3 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -215,6 +215,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index cd5fc389cf..fc5d14f2c7 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -101,6 +101,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
@@ -467,6 +468,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
@@ -834,6 +836,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 56b17714e8..67202da7c5 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -214,6 +214,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
index b6737c6e90..2a7e709e74 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
@@ -491,6 +491,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json
index 29bc01d03c..f878d1789f 100644
--- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json
+++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json
@@ -521,6 +521,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
index d972c8c76c..cfc19d13d1 100644
--- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json
+++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
@@ -214,6 +214,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
index a92427dd0d..a1ddf4b96c 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
@@ -629,6 +629,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
index 60c0186a29..41152bb87c 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
@@ -629,6 +629,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json
index f6beecf627..70f5ca66ee 100644
--- a/infra/bots/recipes/swarm_test.expected/failed_dm.json
+++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json
@@ -215,6 +215,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
index 0d8d65b489..df89340443 100644
--- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
@@ -527,6 +527,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
index f5152326ba..2567e22b52 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
@@ -633,6 +633,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
index c6128469e5..c3b4fe47ad 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
@@ -633,6 +633,7 @@
       "tests",
       "gm",
       "image",
+      "colorImage",
       "--blacklist",
       "f16",
       "_",
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index e7bd4e8111..cb5c8695ee 100644
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -356,7 +356,9 @@ bool SkColorSpace::Equals(const SkColorSpace* src, const SkColorSpace* dst) {
             return (src->fGammaNamed == dst->fGammaNamed) && (src->fToXYZD50 == dst->fToXYZD50);
         default:
             // If |src| does not have a named gamma, fProfileData should be non-null.
-            SkASSERT(false);
+            // FIXME (msarett): We may hit this case on pngs that specify float gammas.
+            //                  Gamma can be non-standard, but we don't have a profile
+            //                  to fall back on.  What do we do?
             return false;
     }
 }