diff options
| author |  Brian Osman <brianosman@google.com> | 2018-06-26 19:20:47 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-26 19:20:53 +0000 |
| commit | d5161b9a62b6912105e7a49d06e5126bf4fa1f75 (patch) | |
| tree | fcd9601dcabcf671354b0f392d793fff8ccdd9c4 /gm | |
| parent | e269310a09646c7df63039392782a078cc5256c6 (diff) | |
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 <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
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 <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/path_stroke_with_zero_length.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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); |