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

Unified 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: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« content/public/common/content_switches.cc ('K') | « ui/gfx/android/java_bitmap.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/android/java_bitmap.cc
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
index a19a000fb71844cc259dcd33e5557d3b2303e59a..5855b021b042f932c96f7f80604cdf8bf39a7514 100644
--- a/ui/gfx/android/java_bitmap.cc
+++ b/ui/gfx/android/java_bitmap.cc
@@ -67,8 +67,8 @@ static ScopedJavaLocalRef<jobject> CreateJavaBitmapFromResource(
return ui::Java_BitmapHelper_decodeDrawableResource(env, jname.obj());
}
-static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) {
- JavaBitmap src_lock(jbitmap.obj());
+SkBitmap CreateSkBitmapFromJavaBitmap(jobject jbitmap) {
+ JavaBitmap src_lock(jbitmap);
DCHECK_EQ(src_lock.format(), ANDROID_BITMAP_FORMAT_RGBA_8888);
gfx::Size src_size = src_lock.size();
@@ -88,7 +88,8 @@ static SkBitmap ConvertToSkBitmap(ScopedJavaLocalRef<jobject> jbitmap) {
}
SkBitmap CreateSkBitmapFromResource(const char* name) {
- return ConvertToSkBitmap(CreateJavaBitmapFromResource(name));
+ ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmapFromResource(name);
+ return CreateSkBitmapFromJavaBitmap(jbitmap.obj());
}
} // namespace gfx
« content/public/common/content_switches.cc ('K') | « ui/gfx/android/java_bitmap.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698