diff options
author | Mike Reed <reed@google.com> | 2017-09-26 17:46:02 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-27 14:36:07 +0000 |
commit | 88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch) | |
tree | a07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /tests/MallocPixelRefTest.cpp | |
parent | fa7ee2447e6227e7f441d32e570489130c0932bb (diff) |
guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Now with legacy behavior for allocpixels
This was reverted, so the current CL is a "fix" on top of ...
https://skia-review.googlesource.com/c/skia/+/50980
Related update to Chrome (in preparation for this change)
https://chromium-review.googlesource.com/c/chromium/src/+/685719
Bug: skia:
Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
Reviewed-on: https://skia-review.googlesource.com/51341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/MallocPixelRefTest.cpp')
-rw-r--r-- | tests/MallocPixelRefTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp index 957c8b3948..ac080994e2 100644 --- a/tests/MallocPixelRefTest.cpp +++ b/tests/MallocPixelRefTest.cpp @@ -32,7 +32,7 @@ DEF_TEST(MallocPixelRef, reporter) { } { size_t rowBytes = info.minRowBytes() - 1; - size_t size = info.getSafeSize(rowBytes); + size_t size = info.computeByteSize(rowBytes); sk_sp<SkData> data(SkData::MakeUninitialized(size)); sk_sp<SkPixelRef> pr( SkMallocPixelRef::MakeWithData(info, rowBytes, data)); @@ -41,7 +41,7 @@ DEF_TEST(MallocPixelRef, reporter) { } { size_t rowBytes = info.minRowBytes() + 2; - size_t size = info.getSafeSize(rowBytes) - 1; + size_t size = info.computeByteSize(rowBytes) - 1; sk_sp<SkData> data(SkData::MakeUninitialized(size)); sk_sp<SkPixelRef> pr( SkMallocPixelRef::MakeWithData(info, rowBytes, data)); @@ -49,7 +49,7 @@ DEF_TEST(MallocPixelRef, reporter) { REPORTER_ASSERT(reporter, nullptr == pr.get()); } size_t rowBytes = info.minRowBytes() + 7; - size_t size = info.getSafeSize(rowBytes) + 9; + size_t size = info.computeByteSize(rowBytes) + 9; { SkAutoMalloc memory(size); sk_sp<SkPixelRef> pr( |