From 2afbe23753bf97402a47408c83107042eea3c476 Mon Sep 17 00:00:00 2001 From: mtklein Date: Sun, 7 Feb 2016 12:23:10 -0800 Subject: [PATCH] msan: initialize buffer BlurLargeImage blurs CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot BUG=skia: Review URL: https://codereview.chromium.org/1676103002 --- tests/ImageFilterTest.cpp | 5 +++-- tools/dm_flags.json | 1 - tools/dm_flags.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 68a95fc..c4e431f 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -185,7 +185,7 @@ DEF_TEST(ImageFilter, reporter) { SkAutoTUnref gray(make_grayscale(nullptr, nullptr)); REPORTER_ASSERT(reporter, true == gray->asColorFilter(nullptr)); } - + { // Check that a colorfilterimage filter without a crop rect but with an input // that is another colorfilterimage can be expressed as a colorfilter (composed). @@ -887,7 +887,7 @@ DEF_TEST(ImageFilterCrossProcessPictureImageFilter, reporter) { pixel = *bitmap.getAddr32(0, 0); // If the security precautions are enabled, the result here should not be green, since the // filter draws nothing. - REPORTER_ASSERT(reporter, SkPicture::PictureIOSecurityPrecautionsEnabled() + REPORTER_ASSERT(reporter, SkPicture::PictureIOSecurityPrecautionsEnabled() ? pixel != SK_ColorGREEN : pixel == SK_ColorGREEN); } @@ -1274,6 +1274,7 @@ static void test_large_blur_input(skiatest::Reporter* reporter, SkCanvas* canvas #endif largeBmp.allocN32Pixels(largeW, largeH); + largeBmp.eraseColor(0); if (!largeBmp.getPixels()) { ERRORF(reporter, "Failed to allocate large bmp."); return; diff --git a/tools/dm_flags.json b/tools/dm_flags.json index e8c9f94..8f3e7dc 100644 --- a/tools/dm_flags.json +++ b/tools/dm_flags.json @@ -1977,7 +1977,6 @@ "_", ".bmp", "--match", - "~BlurLargeImage", "~FontMgrAndroidParser" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [ diff --git a/tools/dm_flags.py b/tools/dm_flags.py index 9c29ffb..b37d0dd 100755 --- a/tools/dm_flags.py +++ b/tools/dm_flags.py @@ -195,7 +195,6 @@ def get_args(bot): blacklist.extend(('_ image _ .png').split(' ')) # I8 .png color tables blacklist.extend(('_ image _ .bmp').split(' ')) # I8 .bmp color tables - match.append('~BlurLargeImage') # Bug in the GM? match.append('~FontMgrAndroidParser') # expat currently uninstrumented. if blacklist: -- 2.7.4