diff options
| author | Mike Reed <reed@google.com> | 2017-09-29 15:22:56 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 12:55:37 +0000 |
| commit | cd284c532376d16fcc4ed75baf3da65c3e4a2e95 (patch) | |
| tree | 5c7e34122e72cef44f279b1aa32638d765d3c639 /tests/MallocPixelRefTest.cpp | |
| parent | 3c83668862521b3bbbd628a522c05688348d6e7f (diff) | |
Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
This reverts commit 809cbedd4b252be221b2ac3b4269d312fd8f53a0.
Bug: skia:
Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
Reviewed-on: https://skia-review.googlesource.com/52665
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
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( |