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

Unified Diff: content/browser/android/content_view_core_impl.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
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 204145c773647024dade3629fe31daaf9bc4fbd1..98b71371e163fb819ffad78d887b72ac3539c095 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -331,6 +331,25 @@ void ContentViewCoreImpl::SetBackgroundColor(JNIEnv* env,
rwhva->OnDidChangeBodyBackgroundColor(color);
}
+void ContentViewCoreImpl::SetOverscrollResources(JNIEnv* env,
+ jobject obj,
+ jobject edge_bitmap,
+ jobject glow_bitmap) {
+ if (!CommandLine::ForCurrentProcess()->
+ HasSwitch(switches::kEnableOverscrollEdgeEffect))
+ return;
+
+ overscroll_edge_ = !edge_bitmap ?
+ SkBitmap() : gfx::CreateSkBitmapFromJavaBitmap(edge_bitmap);
+ overscroll_glow_ = !glow_bitmap ?
+ SkBitmap() : gfx::CreateSkBitmapFromJavaBitmap(glow_bitmap);
+
+ RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
+ if (!rwhva)
+ return;
+ rwhva->OnSetOverscrollResources();
+}
+
void ContentViewCoreImpl::OnHide(JNIEnv* env, jobject obj) {
Hide();
}

Powered by Google App Engine
This is Rietveld 408576698