| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 08ef4aede304e26ffaeedd96606a706c3ec47796..78852b78ab11fcd99766732b93cbd3a6382135fb 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1504,7 +1504,7 @@ void RenderWidgetHostViewAndroid::SendBeginFrame(base::TimeTicks frame_time,
|
|
|
| bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {
|
| bool needs_animate = false;
|
| - if (overscroll_controller_) {
|
| + if (overscroll_controller_ && is_showing_overscroll_glow_) {
|
| needs_animate |= overscroll_controller_->Animate(
|
| frame_time, content_view_core_->GetViewAndroid()->GetLayer());
|
| }
|
| @@ -1719,6 +1719,10 @@ SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
|
| return cached_background_color_;
|
| }
|
|
|
| +void RenderWidgetHostViewAndroid::SetShowingOverscrollGlow(bool showing_glow) {
|
| + is_showing_overscroll_glow_ = showing_glow;
|
| +}
|
| +
|
| void RenderWidgetHostViewAndroid::DidOverscroll(
|
| const ui::DidOverscrollParams& params) {
|
| if (sync_compositor_)
|
| @@ -1803,6 +1807,7 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
|
| view_.GetWindowAndroid()->GetCompositor()) {
|
| overscroll_controller_ = CreateOverscrollController(
|
| content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
|
| + is_showing_overscroll_glow_ = true;
|
| }
|
| }
|
|
|
| @@ -1870,6 +1875,7 @@ void RenderWidgetHostViewAndroid::OnAttachCompositor() {
|
| if (!overscroll_controller_)
|
| overscroll_controller_ = CreateOverscrollController(
|
| content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
|
| + is_showing_overscroll_glow_ = true;
|
| ui::WindowAndroidCompositor* compositor =
|
| view_.GetWindowAndroid()->GetCompositor();
|
| delegated_frame_host_->RegisterFrameSinkHierarchy(
|
|
|