commit cd284c532376d16fcc4ed75baf3da65c3e4a2e95
author Mike Reed <reed@google.com> Fri Sep 29 15:22:56 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 02 12:55:37 2017 +0000
tree 5c7e34122e72cef44f279b1aa32638d765d3c639
parent 3c83668862521b3bbbd628a522c05688348d6e7f

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>

src/utils/mac/SkCreateCGImageRef.cpp

diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index fd55d91..1514ba6 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -132,7 +132,7 @@
 
     const int w = bitmap->width();
     const int h = bitmap->height();
-    const size_t s = bitmap->getSize();
+    const size_t s = bitmap->computeByteSize();
 
     // our provider "owns" the bitmap*, and will take care of deleting it
     CGDataProviderRef dataRef = CGDataProviderCreateWithData(bitmap, bitmap->getPixels(), s,