aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DM.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-09-26 17:46:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-27 14:36:07 +0000
commit88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch)
treea07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /dm/DM.cpp
parentfa7ee2447e6227e7f441d32e570489130c0932bb (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 'dm/DM.cpp')
-rw-r--r--dm/DM.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 777a59345d..ea8ec2742e 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1128,9 +1128,9 @@ struct Task {
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;