diff options
35 files changed, 226 insertions, 1 deletions
diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp new file mode 100644 index 0000000000..80e63f6bc7 --- /dev/null +++ b/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); + } +} diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json index bc571dcd14..16ad3bc84f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json +++ b/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", 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 2a51426af3..d10c04bd14 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 @@ -518,6 +518,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json index 8b285f3fe5..12b31ae003 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json index 336a896384..052af25439 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json index 91389e4b3c..014a850407 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json +++ b/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", 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 c157fa95c0..4b13ac7103 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 @@ -608,6 +608,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json index d509c621ea..f0247a903f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json index ff48c4b0fa..bc6ca58e20 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index d96cb21a8a..6061b17bce 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 032882fb4a..4359d0ba09 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 943f5fcb7a..230acaec73 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/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", 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 fb9ae8de6c..2e679f0721 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 @@ -248,6 +248,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 418b6eb056..789e00703a 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/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", 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 2ea5508ad8..1d0dd695e9 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 @@ -182,6 +182,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", 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 13107b2fd0..a4f44b9abd 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 @@ -299,6 +299,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 3e47b8d966..3e876794d8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 7ea6535109..0ee2a5555b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/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", 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 c482f83ca5..da7501442a 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 @@ -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", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 8ce00a3e62..80f18f3ca8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/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", 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 96597aa308..c88297e89a 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 @@ -355,6 +355,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index e8b7d2cc51..19f846c3f0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/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", 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 ddf2c4ad68..6afb29db0c 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 @@ -650,6 +650,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", 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 77ae9be284..182d3f3dc4 100644 --- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json +++ b/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", 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 4662fa30eb..cc00d7b3d9 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/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", 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 bc4a7f683d..0e0ab8649e 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 @@ -706,6 +706,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", 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 2af4eb6de1..537e6080c6 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 @@ -706,6 +706,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json index 5332275f16..c6853f1bf4 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index aaa522cac2..773f8e5f9d 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -299,6 +299,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", 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 52af68cc4a..b7bad21827 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/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", 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 2f379a2495..e998a35d2d 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 @@ -710,6 +710,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", 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 0afe92dec8..159d8a9ac2 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 @@ -710,6 +710,10 @@ "serialize-8888", "gm", "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", "bitmapfilters", "serialize-8888", "gm", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json index f4511b1f6c..25e8a2ddb2 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index 35ccfbf362..d8db6ad523 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/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", diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index 67c9f2745d..6427af00a6 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/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', |