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" |
11 #include "third_party/skia/include/core/SkBitmap.h" | |
11 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
12 | 13 |
13 class SkBitmap; | 14 namespace gfx { |
14 | 15 |
15 namespace gfx { | 16 // Define Bitmap Config values like BITMAP_CONFIG_ARGB_8888 in a |
17 // way that ensures they're always the same than their Java counterpart. | |
18 | |
19 enum BitmapConfig { | |
20 #define DEFINE_BITMAP_CONFIG(x, y) BITMAP_##x = y, | |
21 #include "base/android/bitmap_config_list.h" | |
Yaron
2014/02/19 18:26:14
Why is this in base? It's only used in ui and seem
sivag
2014/02/20 17:13:59
Can you please advice over this
1. i changed as b
| |
22 #undef DEFINE_BITMAP_CONFIG | |
23 }; | |
16 | 24 |
17 // This class wraps a JNI AndroidBitmap object to make it easier to use. It | 25 // This class wraps a JNI AndroidBitmap object to make it easier to use. It |
18 // handles locking and unlocking of the underlying pixels, along with wrapping | 26 // handles locking and unlocking of the underlying pixels, along with wrapping |
19 // various JNI methods. | 27 // various JNI methods. |
20 class GFX_EXPORT JavaBitmap { | 28 class GFX_EXPORT JavaBitmap { |
21 public: | 29 public: |
30 | |
bulach
2014/02/19 12:42:58
nit: remove extra \n
| |
22 explicit JavaBitmap(jobject bitmap); | 31 explicit JavaBitmap(jobject bitmap); |
23 ~JavaBitmap(); | 32 ~JavaBitmap(); |
24 | 33 |
25 inline void* pixels() { return pixels_; } | 34 inline void* pixels() { return pixels_; } |
26 inline const gfx::Size& size() const { return size_; } | 35 inline const gfx::Size& size() const { return size_; } |
27 // Formats are in android/bitmap.h; e.g. ANDROID_BITMAP_FORMAT_RGBA_8888 | 36 // Formats are in android/bitmap.h; e.g. ANDROID_BITMAP_FORMAT_RGBA_8888 |
28 inline int format() const { return format_; } | 37 inline int format() const { return format_; } |
29 inline uint32_t stride() const { return stride_; } | 38 inline uint32_t stride() const { return stride_; } |
30 | 39 |
31 // Registers methods with JNI and returns true if succeeded. | 40 // Registers methods with JNI and returns true if succeeded. |
(...skipping 12 matching lines...) Expand all Loading... | |
44 GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( | 53 GFX_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( |
45 const SkBitmap* skbitmap); | 54 const SkBitmap* skbitmap); |
46 | 55 |
47 GFX_EXPORT SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap); | 56 GFX_EXPORT SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap); |
48 | 57 |
49 // If the resource loads successfully, it will be resized to |size|. | 58 // If the resource loads successfully, it will be resized to |size|. |
50 // Note: If the source resource is smaller than |size|, quality may suffer. | 59 // Note: If the source resource is smaller than |size|, quality may suffer. |
51 GFX_EXPORT SkBitmap CreateSkBitmapFromResource(const char* name, | 60 GFX_EXPORT SkBitmap CreateSkBitmapFromResource(const char* name, |
52 gfx::Size size); | 61 gfx::Size size); |
53 | 62 |
63 // Returns a Skia config value for the requested input java Bitmap.Config. | |
64 GFX_EXPORT SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config); | |
danakj
2014/02/19 15:42:31
name this JavaConfigToSkiaConfig()?
| |
65 | |
54 } // namespace gfx | 66 } // namespace gfx |
55 | 67 |
56 #endif // UI_GFX_ANDROID_JAVA_BITMAP_H_ | 68 #endif // UI_GFX_ANDROID_JAVA_BITMAP_H_ |
OLD | NEW |