Chromium Code Reviews| Index: ui/gfx/android/java_bitmap.h |
| diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h |
| index 9d1e4432cb7dcafaed425e7b20159b82875f3b31..47140a35d83b77c8462d952800a1fdf0818f84d0 100644 |
| --- a/ui/gfx/android/java_bitmap.h |
| +++ b/ui/gfx/android/java_bitmap.h |
| @@ -8,10 +8,9 @@ |
| #include <jni.h> |
| #include "base/android/scoped_java_ref.h" |
| +#include "third_party/skia/include/core/SkBitmap.h" |
| #include "ui/gfx/size.h" |
| -class SkBitmap; |
| - |
| namespace gfx { |
| // This class wraps a JNI AndroidBitmap object to make it easier to use. It |
| @@ -19,6 +18,14 @@ namespace gfx { |
| // various JNI methods. |
| class GFX_EXPORT JavaBitmap { |
| public: |
| + typedef enum { |
|
no sievers
2014/02/14 18:39:57
nit: use anonymous enum (no typedef)
enum {
};
sivag
2014/02/17 07:09:50
Done.
|
| + BITMAP_CONFIG_NO_CONFIG = 0, |
| + BITMAP_CONFIG_ALPHA_8, |
| + BITMAP_CONFIG_ARGB_4444, |
| + BITMAP_CONFIG_ARGB_8888, |
| + BITMAP_CONFIG_RGB_565 |
| + } Config; |
| + |
| explicit JavaBitmap(jobject bitmap); |
| ~JavaBitmap(); |
| @@ -51,6 +58,9 @@ GFX_EXPORT SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap); |
| GFX_EXPORT SkBitmap CreateSkBitmapFromResource(const char* name, |
| gfx::Size size); |
| +// Returns a Skia config value for the requested input java Bitmap.Config. |
| +GFX_EXPORT SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config); |
| + |
| } // namespace gfx |
| #endif // UI_GFX_ANDROID_JAVA_BITMAP_H_ |