Add imagemasksubset GM

(GM for non-N32 SkImage subsetting)

BUG=skia:5687
R=bsalomon@google.com,robertphillips@google.com,reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2286733002

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

gm/imagemasksubset.cpp

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm.h"
+#include "SkCanvas.h"
+#include "SkImage.h"
+#include "SkImageGenerator.h"
+#include "SkSurface.h"
+#include "sk_tool_utils.h"
+
+namespace {
+
+const SkISize   kSize = SkISize::Make(100, 100);
+const SkIRect kSubset = SkIRect::MakeLTRB(25, 25, 75, 75);
+const SkRect    kDest = SkRect::MakeXYWH(10, 10, 100, 100);
+
+sk_sp<SkImage> make_mask(const sk_sp<SkSurface>& surface) {
+    sk_tool_utils::draw_checkerboard(surface->getCanvas(), 0x80808080, 0x00000000, 5);
+    return surface->makeImageSnapshot();
+}
+
+class MaskGenerator final : public SkImageGenerator {
+public:
+    MaskGenerator(const SkImageInfo& info) : INHERITED(info) {}
+
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor*,
+                     int*) override {
+        if (info.colorType() == kIndex_8_SkColorType) {
+            return false;
+        }
+
+        make_mask(SkSurface::MakeRasterDirect(info, pixels, rowBytes));
+        return true;
+    }
+
+private:
+    typedef SkImageGenerator INHERITED;
+};
+
+using MakerT = sk_sp<SkImage>(*)(SkCanvas*, const SkImageInfo&);
+const MakerT makers[] = {
+    // SkImage_Raster
+    [](SkCanvas*, const SkImageInfo& info) -> sk_sp<SkImage> {
+        return make_mask(SkSurface::MakeRaster(info));
+    },
+
+    // SkImage_Gpu
+    [](SkCanvas* c, const SkImageInfo& info) -> sk_sp<SkImage> {
+        sk_sp<SkSurface> surface;
+#if SK_SUPPORT_GPU
+        surface = SkSurface::MakeRenderTarget(c->getGrContext(), SkBudgeted::kNo, info);
+#endif
+        return make_mask(surface ? surface : SkSurface::MakeRaster(info));
+    },
+
+    // SkImage_Generator
+    [](SkCanvas*, const SkImageInfo& info) -> sk_sp<SkImage> {
+        return SkImage::MakeFromGenerator(new MaskGenerator(info));
+    },
+};
+
+} // anonymous ns
+
+// Checks whether subset SkImages preserve the original color type (A8 in this case).
+DEF_SIMPLE_GM(imagemasksubset, canvas, 480, 480) {
+    SkPaint paint;
+    paint.setColor(0xff00ff00);
+
+    const SkImageInfo info = SkImageInfo::MakeA8(kSize.width(), kSize.height());
+
+    for (size_t i = 0; i < SK_ARRAY_COUNT(makers); ++i) {
+        sk_sp<SkImage> image = makers[i](canvas, info);
+        if (image) {
+            canvas->drawImageRect(image, SkRect::Make(kSubset), kDest, &paint);
+            sk_sp<SkImage> subset = image->makeSubset(kSubset);
+            canvas->drawImageRect(subset, kDest.makeOffset(kSize.width() * 1.5f, 0), &paint);
+        }
+        canvas->translate(0, kSize.height() * 1.5f);
+    }
+}

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json

@@ -609,6 +609,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json

@@ -518,6 +518,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json

@@ -611,6 +611,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json

@@ -609,6 +609,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json

@@ -610,6 +610,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json

@@ -608,6 +608,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json

@@ -609,6 +609,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json

@@ -605,6 +605,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json

@@ -326,6 +326,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json

@@ -328,6 +328,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json

@@ -320,6 +320,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json

@@ -248,6 +248,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json

@@ -300,6 +300,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json

@@ -182,6 +182,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json

@@ -299,6 +299,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json

@@ -301,6 +301,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json

@@ -182,6 +182,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json

@@ -205,6 +205,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
@@ -642,6 +646,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
@@ -1080,6 +1088,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json

@@ -331,6 +331,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json

@@ -355,6 +355,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json

@@ -348,6 +348,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json

@@ -650,6 +650,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/adb_in_path.json

@@ -604,6 +604,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/big_issue_number.json

@@ -355,6 +355,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json

@@ -706,6 +706,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/download_and_push_skps.json

@@ -706,6 +706,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json

@@ -706,6 +706,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/failed_dm.json

@@ -299,6 +299,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/failed_get_hashes.json

@@ -610,6 +610,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json

@@ -710,6 +710,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json

@@ -710,6 +710,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json

@@ -710,6 +710,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json

@@ -304,6 +304,10 @@
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",

infra/bots/recipes/swarm_test.py

@@ -217,7 +217,8 @@ def dm_flags(bot):
                        'fontmgr_bounds_1_-0.25',
                        'fontmgr_bounds',
                        'fontmgr_match',
-                       'fontmgr_iter']
+                       'fontmgr_iter',
+                       'imagemasksubset']
 
   # skia:5589
   bad_serialize_gms.extend(['bitmapfilters',