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..218f69a78bb6ccfa4efabde87f9d75f312b74842 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: |
+ enum { |
+ BITMAP_CONFIG_NO_CONFIG = 0, |
bulach
2014/02/17 10:33:58
as above, let's extract this to avoid duplication.
sivag
2014/02/18 16:06:22
Done.
|
+ BITMAP_CONFIG_ALPHA_8, |
+ BITMAP_CONFIG_ARGB_4444, |
+ BITMAP_CONFIG_ARGB_8888, |
+ BITMAP_CONFIG_RGB_565 |
+ }; |
+ |
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_ |