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

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

Issue 23740010: Revert 223162 "Update the nine patch layer to use UI resources" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/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/logging.h" 9 #include "base/logging.h"
10 #include "jni/BitmapHelper_jni.h" 10 #include "jni/BitmapHelper_jni.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 CreateJavaBitmap(gfx::Size(skbitmap->width(), skbitmap->height())); 54 CreateJavaBitmap(gfx::Size(skbitmap->width(), skbitmap->height()));
55 SkAutoLockPixels src_lock(*skbitmap); 55 SkAutoLockPixels src_lock(*skbitmap);
56 JavaBitmap dst_lock(jbitmap.obj()); 56 JavaBitmap dst_lock(jbitmap.obj());
57 void* src_pixels = skbitmap->getPixels(); 57 void* src_pixels = skbitmap->getPixels();
58 void* dst_pixels = dst_lock.pixels(); 58 void* dst_pixels = dst_lock.pixels();
59 memcpy(dst_pixels, src_pixels, skbitmap->getSize()); 59 memcpy(dst_pixels, src_pixels, skbitmap->getSize());
60 60
61 return jbitmap; 61 return jbitmap;
62 } 62 }
63 63
64 SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap) { 64 static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource(
65 DCHECK_EQ(jbitmap.format(), ANDROID_BITMAP_FORMAT_RGBA_8888); 65 const char* name, gfx::Size requested_size) {
66 JNIEnv* env = AttachCurrentThread();
67 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
68 return ui::Java_BitmapHelper_decodeDrawableResource(env,
69 jname.obj(),
70 requested_size.width(),
71 requested_size.height());
72 }
66 73
67 gfx::Size src_size = jbitmap.size(); 74 static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) {
75 if (jbitmap.is_null())
76 return SkBitmap();
77
78 JavaBitmap src_lock(jbitmap.obj());
79 DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888);
80
81 gfx::Size src_size = src_lock.size();
68 82
69 SkBitmap skbitmap; 83 SkBitmap skbitmap;
70 skbitmap.setConfig(SkBitmap::kARGB_8888_Config, 84 skbitmap.setConfig(SkBitmap::kARGB_8888_Config,
71 src_size.width(), 85 src_size.width(), src_size.height(), src_lock.stride());
72 src_size.height(),
73 jbitmap.stride());
74 skbitmap.allocPixels(); 86 skbitmap.allocPixels();
75 SkAutoLockPixels dst_lock(skbitmap); 87 SkAutoLockPixels dst_lock(skbitmap);
76 88
77 void* src_pixels = jbitmap.pixels(); 89 void* src_pixels = src_lock.pixels();
78 void* dst_pixels = skbitmap.getPixels(); 90 void* dst_pixels = skbitmap.getPixels();
79 91
80 memcpy(dst_pixels, src_pixels, skbitmap.getSize()); 92 memcpy(dst_pixels, src_pixels, skbitmap.getSize());
81 93
82 return skbitmap; 94 return skbitmap;
83 } 95 }
84 96
85 SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) { 97 SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) {
86 DCHECK(!size.IsEmpty()); 98 DCHECK(!size.IsEmpty());
87 JNIEnv* env = AttachCurrentThread(); 99 SkBitmap bitmap =
88 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name)); 100 ConvertToSkBitmap(CreateJavaBitmapFromResource(name, size));
89 ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource( 101 if (bitmap.isNull())
90 env, jname.obj(), size.width(), size.height())); 102 return bitmap;
91 if (jobj.is_null()) 103 // RESIZE_BOX has sufficient downsampling quality with minimal runtime cost.
92 return SkBitmap(); 104 return skia::ImageOperations::Resize(bitmap,
93 105 skia::ImageOperations::RESIZE_BOX,
94 JavaBitmap jbitmap(jobj.obj()); 106 size.width(), size.height());
95 SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(jbitmap);
96 return skia::ImageOperations::Resize(
97 bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height());
98 } 107 }
99 108
100 } // namespace gfx 109 } // namespace gfx
OLDNEW
« no previous file with comments | « trunk/src/ui/gfx/android/java_bitmap.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698