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

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

Issue 14268004: Add overscroll edge effect animations for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use LazyInstance for overscroll resources Created 7 years, 7 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 | « content/public/common/content_switches.cc ('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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource( 63 static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource(
64 const char* name) { 64 const char* name) {
65 JNIEnv* env = AttachCurrentThread(); 65 JNIEnv* env = AttachCurrentThread();
66 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name)); 66 ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
67 return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj()); 67 return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj());
68 } 68 }
69 69
70 static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) { 70 static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) {
71 if (jbitmap.is_null())
72 return SkBitmap();
73
71 JavaBitmap src_lock(jbitmap.obj()); 74 JavaBitmap src_lock(jbitmap.obj());
72 DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888); 75 DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888);
73 76
74 gfx::Size src_size = src_lock.size(); 77 gfx::Size src_size = src_lock.size();
75 78
76 SkBitmap skbitmap; 79 SkBitmap skbitmap;
77 skbitmap.setConfig(SkBitmap::kARGB_8888_Config, 80 skbitmap.setConfig(SkBitmap::kARGB_8888_Config,
78 src_size.width(), src_size.height(), src_lock.stride()); 81 src_size.width(), src_size.height(), src_lock.stride());
79 skbitmap.allocPixels(); 82 skbitmap.allocPixels();
80 SkAutoLockPixels dst_lock(skbitmap); 83 SkAutoLockPixels dst_lock(skbitmap);
81 84
82 void* src_pixels = src_lock.pixels(); 85 void* src_pixels = src_lock.pixels();
83 void* dst_pixels = skbitmap.getPixels(); 86 void* dst_pixels = skbitmap.getPixels();
84 87
85 memcpy(dst_pixels, src_pixels, skbitmap.getSize()); 88 memcpy(dst_pixels, src_pixels, skbitmap.getSize());
86 89
87 return skbitmap; 90 return skbitmap;
88 } 91 }
89 92
90 SkBitmap CreateSkBitmapFromResource(const char* name) { 93 SkBitmap CreateSkBitmapFromResource(const char* name) {
91 return ConvertToSkBitmap(CreateJavaBitmapFromResource(name)); 94 return ConvertToSkBitmap(CreateJavaBitmapFromResource(name));
92 } 95 }
93 96
94 } // namespace gfx 97 } // namespace gfx
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698