| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gfx/android/java_bitmap.h" | 5 #include "ui/gfx/android/java_bitmap.h" |
| 6 | 6 |
| 7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "jni/BitmapHelper_jni.h" | 10 #include "jni/BitmapHelper_jni.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 return jbitmap; | 60 return jbitmap; |
| 61 } | 61 } |
| 62 | 62 |
| 63 static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource( | 63 static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource( |
| 64 const char* name) { | 64 const char* name) { |
| 65 JNIEnv* env = AttachCurrentThread(); | 65 JNIEnv* env = AttachCurrentThread(); |
| 66 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name)); | 66 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name)); |
| 67 return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj()); | 67 return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj()); |
| 68 } | 68 } |
| 69 | 69 |
| 70 static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) { | 70 SkBitmap CreateSkBitmapFromJavaBitmap(jobject jbitmap) { |
| 71 JavaBitmap src_lock(jbitmap.obj()); | 71 JavaBitmap src_lock(jbitmap); |
| 72 DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888); | 72 DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888); |
| 73 | 73 |
| 74 gfx::Size src_size = src_lock.size(); | 74 gfx::Size src_size = src_lock.size(); |
| 75 | 75 |
| 76 SkBitmap skbitmap; | 76 SkBitmap skbitmap; |
| 77 skbitmap.setConfig(SkBitmap::kARGB_8888_Config, | 77 skbitmap.setConfig(SkBitmap::kARGB_8888_Config, |
| 78 src_size.width(), src_size.height(), src_lock.stride()); | 78 src_size.width(), src_size.height(), src_lock.stride()); |
| 79 skbitmap.allocPixels(); | 79 skbitmap.allocPixels(); |
| 80 SkAutoLockPixels dst_lock(skbitmap); | 80 SkAutoLockPixels dst_lock(skbitmap); |
| 81 | 81 |
| 82 void* src_pixels = src_lock.pixels(); | 82 void* src_pixels = src_lock.pixels(); |
| 83 void* dst_pixels = skbitmap.getPixels(); | 83 void* dst_pixels = skbitmap.getPixels(); |
| 84 | 84 |
| 85 memcpy(dst_pixels, src_pixels, skbitmap.getSize()); | 85 memcpy(dst_pixels, src_pixels, skbitmap.getSize()); |
| 86 | 86 |
| 87 return skbitmap; | 87 return skbitmap; |
| 88 } | 88 } |
| 89 | 89 |
| 90 SkBitmap CreateSkBitmapFromResource(const char* name) { | 90 SkBitmap CreateSkBitmapFromResource(const char* name) { |
| 91 return ConvertToSkBitmap(CreateJavaBitmapFromResource(name)); | 91 ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmapFromResource(name); |
| 92 return CreateSkBitmapFromJavaBitmap(jbitmap.obj()); |
| 92 } | 93 } |
| 93 | 94 |
| 94 } // namespace gfx | 95 } // namespace gfx |
| OLD | NEW |