diff options
Diffstat (limited to 'ui/gfx/android/java_bitmap.cc')
-rw-r--r-- | ui/gfx/android/java_bitmap.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc index 37da9d9..ea0a50f 100644 --- a/ui/gfx/android/java_bitmap.cc +++ b/ui/gfx/android/java_bitmap.cc @@ -29,6 +29,7 @@ JavaBitmap::JavaBitmap(jobject bitmap) size_ = gfx::Size(info.width, info.height); format_ = info.format; stride_ = info.stride; + byte_count_ = Java_BitmapHelper_getByteCount(AttachCurrentThread(), bitmap_); } JavaBitmap::~JavaBitmap() { @@ -108,6 +109,7 @@ SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) { CHECK(false) << "Invalid Java bitmap format: " << jbitmap.format(); break; } + CHECK_EQ(jbitmap.byte_count(), static_cast<int>(skbitmap.getSize())); const void* src_pixels = jbitmap.pixels(); void* dst_pixels = skbitmap.getPixels(); memcpy(dst_pixels, src_pixels, skbitmap.getSize()); |