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 #ifndef UI_GFX_ANDROID_JAVA_BITMAP_H_ | 5 #ifndef UI_GFX_ANDROID_JAVA_BITMAP_H_ |
6 #define UI_GFX_ANDROID_JAVA_BITMAP_H_ | 6 #define UI_GFX_ANDROID_JAVA_BITMAP_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 | 40 |
41 DISALLOW_COPY_AND_ASSIGN(JavaBitmap); | 41 DISALLOW_COPY_AND_ASSIGN(JavaBitmap); |
42 }; | 42 }; |
43 | 43 |
44 UI_EXPORT base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap( | 44 UI_EXPORT base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap( |
45 const gfx::Size& size); | 45 const gfx::Size& size); |
46 | 46 |
47 UI_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( | 47 UI_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( |
48 const SkBitmap* skbitmap); | 48 const SkBitmap* skbitmap); |
49 | 49 |
| 50 SkBitmap CreateSkBitmapFromJavaBitmap(jobject jbitmap); |
50 SkBitmap CreateSkBitmapFromResource(const char* name); | 51 SkBitmap CreateSkBitmapFromResource(const char* name); |
51 | 52 |
52 } // namespace gfx | 53 } // namespace gfx |
53 | 54 |
54 #endif // UI_GFX_ANDROID_JAVA_BITMAP_H_ | 55 #endif // UI_GFX_ANDROID_JAVA_BITMAP_H_ |
OLD | NEW |