diff options
| author |  reed <reed@google.com> | 2016-03-09 14:26:26 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 14:26:26 -0800 |
| commit | 6ceeebd37a43d879c120b6ba100ae1febdd67a18 (patch) | |
| tree | 6c4dfeb68ba4183bc2e63d8888ae01f24caede88 /tests/CanvasTest.cpp | |
| parent | f842c50116863f44240f806509f14e434eabb0a8 (diff) | |
unify peekPixels around pixmap parameter
requires this chrome CL to land first
https://codereview.chromium.org/1775393003/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1784563002
Review URL: https://codereview.chromium.org/1784563002
Diffstat (limited to 'tests/CanvasTest.cpp')
| -rw-r--r-- | tests/CanvasTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 2390c7455f..f34430f475 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -646,17 +646,16 @@ static void test_newraster(skiatest::Reporter* reporter) { SkCanvas* canvas = SkCanvas::NewRasterDirect(info, baseAddr, minRowBytes); REPORTER_ASSERT(reporter, canvas); - SkImageInfo info2; - size_t rowBytes; - const SkPMColor* addr = (const SkPMColor*)canvas->peekPixels(&info2, &rowBytes); + SkPixmap pmap; + const SkPMColor* addr = canvas->peekPixels(&pmap) ? pmap.addr32() : nullptr; REPORTER_ASSERT(reporter, addr); - REPORTER_ASSERT(reporter, info == info2); - REPORTER_ASSERT(reporter, minRowBytes == rowBytes); + REPORTER_ASSERT(reporter, info == pmap.info()); + REPORTER_ASSERT(reporter, minRowBytes == pmap.rowBytes()); for (int y = 0; y < info.height(); ++y) { for (int x = 0; x < info.width(); ++x) { REPORTER_ASSERT(reporter, 0 == addr[x]); } - addr = (const SkPMColor*)((const char*)addr + rowBytes); + addr = (const SkPMColor*)((const char*)addr + pmap.rowBytes()); } delete canvas; |