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

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: Rebase 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 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 ef6d4730029c3b5a7dc01eeb44251edf2ef9e3d3..c51a29f1f0cb4141b2d0b57b809ab00f79f4e61c 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -699,6 +699,14 @@ void ContentViewCoreImpl::SetVSyncNotificationEnabled(bool enabled) {
env, obj.obj(), static_cast<jboolean>(enabled));
}
+void ContentViewCoreImpl::SetNeedsAnimate() {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+ if (obj.is_null())
+ return;
+ Java_ContentViewCore_setNeedsAnimate(env, obj.obj());
+}
+
ui::ViewAndroid* ContentViewCoreImpl::GetViewAndroid() const {
// view_android_ should never be null for Chrome.
DCHECK(view_android_);
@@ -1223,6 +1231,15 @@ void ContentViewCoreImpl::OnVSync(JNIEnv* env, jobject /* obj */,
view->SendVSync(base::TimeTicks::FromInternalValue(frame_time_micros));
}
+void ContentViewCoreImpl::Animate(JNIEnv* env, jobject /* obj */,
+ jlong frame_time_micros) {
+ RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
+ if (!view)
+ return;
+
+ view->Animate(base::TimeTicks::FromInternalValue(frame_time_micros));
+}
+
jboolean ContentViewCoreImpl::PopulateBitmapFromCompositor(JNIEnv* env,
jobject obj,
jobject jbitmap) {
@@ -1282,6 +1299,8 @@ void ContentViewCoreImpl::DetachExternalVideoSurface(JNIEnv* env,
#endif
}
+
aelias_OOO_until_Jul13 2013/05/10 04:37:07 Nit: accidental whitespace
jdduke (slow) 2013/05/10 16:39:52 Oops, fixed.
+
jboolean ContentViewCoreImpl::IsRenderWidgetHostViewReady(JNIEnv* env,
jobject obj) {
RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();

Powered by Google App Engine
This is Rietveld 408576698