commit f0ffb8943b7be477b769db23660a80013f3332eb
author Mike Reed <reed@google.com> Tue Oct 03 14:47:21 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 03 20:03:35 2017 +0000
tree 9aa9b49cf411799b50168bd16aee922bc9b13f8e
parent d140fe910e11edf2496439e39ba6ca15d5bc17db

Revert[4] "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"

This reverts commit 5a2e50edc51006ce91366e177a9d21a16775d7fd.

Bug: skia:
Change-Id: I8d28b5c07d90130e5a1653923740eaf189ecb954
Reviewed-on: https://skia-review.googlesource.com/53900
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 777a593..ea8ec27 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1128,9 +1128,9 @@
                             SkBitmap swizzle;
                             SkAssertResult(sk_tool_utils::copy_to(&swizzle, kRGBA_8888_SkColorType,
                                                                   bitmap));
-                            hash.write(swizzle.getPixels(), swizzle.getSize());
+                            hash.write(swizzle.getPixels(), swizzle.computeByteSize());
                         } else {
-                            hash.write(bitmap.getPixels(), bitmap.getSize());
+                            hash.write(bitmap.getPixels(), bitmap.computeByteSize());
                         }
                     }
                     SkMD5::Digest digest;