Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Side by Side Diff: ui/gfx/android/java_bitmap.cc

Issue 1620203004: Notification action icons prototype. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make it work on Android and clean up. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/android/java_bitmap.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_android.h"
9 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "jni/BitmapHelper_jni.h" 12 #include "jni/BitmapHelper_jni.h"
12 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
13 14
14 using base::android::AttachCurrentThread; 15 using base::android::AttachCurrentThread;
15 using base::android::ConvertUTF8ToJavaString; 16 using base::android::ConvertUTF8ToJavaString;
16 17
17 namespace gfx { 18 namespace gfx {
18 19
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 skbitmap->width(), skbitmap->height(), color_type); 80 skbitmap->width(), skbitmap->height(), color_type);
80 SkAutoLockPixels src_lock(*skbitmap); 81 SkAutoLockPixels src_lock(*skbitmap);
81 JavaBitmap dst_lock(jbitmap.obj()); 82 JavaBitmap dst_lock(jbitmap.obj());
82 void* src_pixels = skbitmap->getPixels(); 83 void* src_pixels = skbitmap->getPixels();
83 void* dst_pixels = dst_lock.pixels(); 84 void* dst_pixels = dst_lock.pixels();
84 memcpy(dst_pixels, src_pixels, skbitmap->getSize()); 85 memcpy(dst_pixels, src_pixels, skbitmap->getSize());
85 86
86 return jbitmap; 87 return jbitmap;
87 } 88 }
88 89
90 ScopedJavaLocalRef<jobjectArray> ConvertToJavaBitmaps(
91 const std::vector<SkBitmap>& skbitmaps) {
92 JNIEnv* env = AttachCurrentThread();
93 ScopedJavaLocalRef<jclass> clazz =
94 base::android::GetClass(env, "android/graphics/Bitmap");
95 jobjectArray array = env->NewObjectArray(skbitmaps.size(), clazz.obj(),
96 nullptr /* initialElement */);
97 base::android::CheckException(env);
98
99 for (size_t i = 0; i < skbitmaps.size(); ++i) {
100 if (skbitmaps[i].drawsNothing()) {
101 env->SetObjectArrayElement(array, i, nullptr);
102 } else {
103 env->SetObjectArrayElement(array, i,
104 ConvertToJavaBitmap(&(skbitmaps[i])).obj());
105 }
106 }
107
108 return ScopedJavaLocalRef<jobjectArray>(env, array);
109 }
110
89 SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) { 111 SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) {
90 DCHECK(!jbitmap.size().IsEmpty()); 112 DCHECK(!jbitmap.size().IsEmpty());
91 DCHECK_GT(jbitmap.stride(), 0U); 113 DCHECK_GT(jbitmap.stride(), 0U);
92 DCHECK(jbitmap.pixels()); 114 DCHECK(jbitmap.pixels());
93 115
94 gfx::Size src_size = jbitmap.size(); 116 gfx::Size src_size = jbitmap.size();
95 117
96 SkBitmap skbitmap; 118 SkBitmap skbitmap;
97 switch (jbitmap.format()) { 119 switch (jbitmap.format()) {
98 case ANDROID_BITMAP_FORMAT_RGBA_8888: 120 case ANDROID_BITMAP_FORMAT_RGBA_8888:
(...skipping 30 matching lines...) Expand all
129 return kN32_SkColorType; 151 return kN32_SkColorType;
130 case BITMAP_FORMAT_RGB_565: 152 case BITMAP_FORMAT_RGB_565:
131 return kRGB_565_SkColorType; 153 return kRGB_565_SkColorType;
132 case BITMAP_FORMAT_NO_CONFIG: 154 case BITMAP_FORMAT_NO_CONFIG:
133 default: 155 default:
134 return kUnknown_SkColorType; 156 return kUnknown_SkColorType;
135 } 157 }
136 } 158 }
137 159
138 } // namespace gfx 160 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/android/java_bitmap.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698