From d5161b9a62b6912105e7a49d06e5126bf4fa1f75 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 26 Jun 2018 19:20:47 +0000 Subject: Reland "Revert "Update GPU DM/nanobench configs for color testing"" This reverts commit c0fb3c8b9fea2f60062819e92a1fa7f0a1966fba. Reason for revert: Had to revert dependent CL. Original change's description: > Revert "Revert "Update GPU DM/nanobench configs for color testing"" > > This reverts commit 2a284de7a51c198096a6f34ec1cbfe9118db554c. > > Re-landing without esrgb configs. Going to enable those separately, > as they require some blacklisting. > > Bug: skia: > Change-Id: I2315849d4f5c45c2e5512f84f9f867d02ff6fe30 > Reviewed-on: https://skia-review.googlesource.com/136589 > Reviewed-by: Brian Osman > Commit-Queue: Brian Osman TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com Change-Id: I942d4235c17100fd933bf9cbfe923e3ae80657b1 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/137721 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- gm/path_stroke_with_zero_length.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gm') diff --git a/gm/path_stroke_with_zero_length.cpp b/gm/path_stroke_with_zero_length.cpp index 3cb789f0ac..63ffe951c6 100644 --- a/gm/path_stroke_with_zero_length.cpp +++ b/gm/path_stroke_with_zero_length.cpp @@ -35,9 +35,7 @@ static bool draw_path_cell(SkCanvas* canvas, SkImage* img, int expectedCaps) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoPixmapStorage pmap; pmap.alloc(info); - if (!img->readPixels(pmap, 0, 0)) { - return false; - } + SkAssertResult(img->readPixels(pmap, 0, 0)); // To account for rasterization differences, we scan the middle two rows [y, y+1] of the image SkASSERT(h % 2 == 0); -- cgit v1.2.3