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/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 23 matching lines...) Expand all Loading... | |
34 JavaBitmap::~JavaBitmap() { | 34 JavaBitmap::~JavaBitmap() { |
35 int err = AndroidBitmap_unlockPixels(AttachCurrentThread(), bitmap_); | 35 int err = AndroidBitmap_unlockPixels(AttachCurrentThread(), bitmap_); |
36 DCHECK(!err); | 36 DCHECK(!err); |
37 } | 37 } |
38 | 38 |
39 // static | 39 // static |
40 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) { | 40 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) { |
41 return RegisterNativesImpl(env); | 41 return RegisterNativesImpl(env); |
42 } | 42 } |
43 | 43 |
44 static ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width, int height, | 44 static ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width, |
45 bool is565_config) { | 45 int height, |
46 return Java_BitmapHelper_createBitmap(AttachCurrentThread(), | 46 int bitmap_config) { |
47 width, height, is565_config); | 47 |
48 return Java_BitmapHelper_createBitmap( | |
49 AttachCurrentThread(), width, height, bitmap_config); | |
50 } | |
51 | |
52 static int SkBitmapConfigToBitmapFormat(SkBitmap::Config bitmap_config) { | |
53 int matching_enum_config = BITMAP_FORMAT_NO_CONFIG; | |
bulach
2014/03/04 13:05:13
no need to initialize..
sivag
2014/03/04 13:57:55
Done.
| |
54 switch (bitmap_config) { | |
55 case SkBitmap::kA8_Config: | |
56 matching_enum_config = BITMAP_FORMAT_ALPHA_8; | |
bulach
2014/03/04 13:05:13
would it be possible to just "return" on these cas
sivag
2014/03/04 13:57:55
Done.
| |
57 break; | |
58 case SkBitmap::kARGB_4444_Config: | |
59 matching_enum_config = BITMAP_FORMAT_ARGB_4444; | |
60 break; | |
61 case SkBitmap::kARGB_8888_Config: | |
62 matching_enum_config = BITMAP_FORMAT_ARGB_8888; | |
63 break; | |
64 case SkBitmap::kRGB_565_Config: | |
65 matching_enum_config = BITMAP_FORMAT_RGB_565; | |
66 break; | |
67 case SkBitmap::kNo_Config: | |
68 default: | |
69 matching_enum_config = BITMAP_FORMAT_NO_CONFIG; | |
70 break; | |
71 } | |
72 DCHECK(matching_enum_config == BITMAP_FORMAT_NO_CONFIG); | |
bulach
2014/03/04 13:05:13
shouldn't this be != ?
sivag
2014/03/04 13:57:55
Done.
| |
73 return matching_enum_config; | |
48 } | 74 } |
49 | 75 |
50 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) { | 76 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) { |
51 DCHECK(skbitmap); | 77 DCHECK(skbitmap); |
52 SkBitmap::Config config = skbitmap->getConfig(); | 78 SkBitmap::Config config = skbitmap->getConfig(); |
53 DCHECK((config == SkBitmap::kRGB_565_Config) || | 79 DCHECK((config == SkBitmap::kRGB_565_Config) || |
54 (config == SkBitmap::kARGB_8888_Config)); | 80 (config == SkBitmap::kARGB_8888_Config)); |
55 // If the Config is not RGB565 it is default i.e ARGB8888 | 81 // If the Config is not RGB565 it is default i.e ARGB8888 |
bulach
2014/03/04 13:05:13
this comment is obsolete now..
sivag
2014/03/04 13:57:55
Done.
| |
56 ScopedJavaLocalRef<jobject> jbitmap = | 82 int java_bitmap_config = SkBitmapConfigToBitmapFormat(config); |
57 CreateJavaBitmap(skbitmap->width(), skbitmap->height(), | 83 ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap( |
58 (config == SkBitmap::kRGB_565_Config)); | 84 skbitmap->width(), skbitmap->height(), java_bitmap_config); |
59 SkAutoLockPixels src_lock(*skbitmap); | 85 SkAutoLockPixels src_lock(*skbitmap); |
60 JavaBitmap dst_lock(jbitmap.obj()); | 86 JavaBitmap dst_lock(jbitmap.obj()); |
61 void* src_pixels = skbitmap->getPixels(); | 87 void* src_pixels = skbitmap->getPixels(); |
62 void* dst_pixels = dst_lock.pixels(); | 88 void* dst_pixels = dst_lock.pixels(); |
63 memcpy(dst_pixels, src_pixels, skbitmap->getSize()); | 89 memcpy(dst_pixels, src_pixels, skbitmap->getSize()); |
64 | 90 |
65 return jbitmap; | 91 return jbitmap; |
66 } | 92 } |
67 | 93 |
68 SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap) { | 94 SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap) { |
(...skipping 26 matching lines...) Expand all Loading... | |
95 if (jobj.is_null()) | 121 if (jobj.is_null()) |
96 return SkBitmap(); | 122 return SkBitmap(); |
97 | 123 |
98 JavaBitmap jbitmap(jobj.obj()); | 124 JavaBitmap jbitmap(jobj.obj()); |
99 SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(jbitmap); | 125 SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(jbitmap); |
100 return skia::ImageOperations::Resize( | 126 return skia::ImageOperations::Resize( |
101 bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height()); | 127 bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height()); |
102 } | 128 } |
103 | 129 |
104 SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config) { | 130 SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config) { |
105 int jbitmap_config = | 131 int jbitmap_config = Java_BitmapHelper_getConfigEnumValue( |
106 Java_BitmapHelper_bitmapConfig(AttachCurrentThread(), bitmap_config); | 132 AttachCurrentThread(), bitmap_config); |
107 switch (jbitmap_config) { | 133 switch (jbitmap_config) { |
108 case BITMAP_FORMAT_ALPHA_8: | 134 case BITMAP_FORMAT_ALPHA_8: |
109 return SkBitmap::kA8_Config; | 135 return SkBitmap::kA8_Config; |
110 case BITMAP_FORMAT_ARGB_4444: | 136 case BITMAP_FORMAT_ARGB_4444: |
111 return SkBitmap::kARGB_4444_Config; | 137 return SkBitmap::kARGB_4444_Config; |
112 case BITMAP_FORMAT_ARGB_8888: | 138 case BITMAP_FORMAT_ARGB_8888: |
113 return SkBitmap::kARGB_8888_Config; | 139 return SkBitmap::kARGB_8888_Config; |
114 case BITMAP_FORMAT_RGB_565: | 140 case BITMAP_FORMAT_RGB_565: |
115 return SkBitmap::kRGB_565_Config; | 141 return SkBitmap::kRGB_565_Config; |
116 case BITMAP_FORMAT_NO_CONFIG: | 142 case BITMAP_FORMAT_NO_CONFIG: |
117 default: | 143 default: |
118 return SkBitmap::kNo_Config; | 144 return SkBitmap::kNo_Config; |
119 } | 145 } |
120 } | 146 } |
121 | 147 |
122 } // namespace gfx | 148 } // namespace gfx |
OLD | NEW |