Fix overscroll glow when the FIP dialog is active

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 278 matching lines @@
     const std::vector<webkit::npapi::WebPluginGeometry>& moves) {
   // We don't have plugin windows on Android. Do nothing. Note: this is called
   // from RenderWidgetHost::OnUpdateRect which is itself invoked while
   // processing the corresponding message from Renderer.
 }
 
 void RenderWidgetHostViewAndroid::Focus() {
   host_->Focus();
   host_->SetInputMethodActive(true);
   ResetClipping();
+  if (overscroll_effect_)
+    overscroll_effect_->SetEnabled(true);
 }
 
 void RenderWidgetHostViewAndroid::Blur() {
   host_->ExecuteEditCommand("Unselect", "");
   host_->SetInputMethodActive(false);
   host_->Blur();
-
   if (overscroll_effect_)
-    overscroll_effect_->Finish();
+    overscroll_effect_->SetEnabled(false);
 }
 
 bool RenderWidgetHostViewAndroid::HasFocus() const {
   if (!content_view_core_)
     return false;  // ContentViewCore not created yet.
 
   return content_view_core_->HasFocus();
 }
 
 bool RenderWidgetHostViewAndroid::IsSurfaceAvailableForCopy() const {
@@ skipping 414 matching lines @@
   if (!content_view_core_)
     return;
 
   if (overscroll_effect_)
     content_view_core_->RemoveLayer(overscroll_effect_->root_layer());
 
   content_view_core_->RemoveLayer(layer_);
 }
 
 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {
-  if (!overscroll_effect_ || !HasFocus())
+  if (!overscroll_effect_)
     return false;
   return overscroll_effect_->Animate(frame_time);
 }
 
 void RenderWidgetHostViewAndroid::CreateOverscrollEffectIfNecessary() {
   if (!overscroll_effect_enabled_ || overscroll_effect_)
     return;
 
   overscroll_effect_ = OverscrollGlow::Create();
 
@@ skipping 15 matching lines @@
   overscroll_effect_->set_horizontal_overscroll_enabled(
       ceiled_viewport_size.width() < frame_metadata.root_layer_size.width());
   overscroll_effect_->set_vertical_overscroll_enabled(
       ceiled_viewport_size.height() < frame_metadata.root_layer_size.height());
   overscroll_effect_->set_size(content_size_in_layer_);
 }
 
 void RenderWidgetHostViewAndroid::ScheduleAnimationIfNecessary() {
   if (!content_view_core_)
     return;
-  if (overscroll_effect_ && overscroll_effect_->IsActive())
+  if (overscroll_effect_ && overscroll_effect_->NeedsAnimate())
     content_view_core_->SetNeedsAnimate();
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   NOTREACHED();
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() {
@@ skipping 167 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::SendMouseWheelEvent(
     const WebKit::WebMouseWheelEvent& event) {
   if (host_)
     host_->ForwardWheelEvent(event);
 }
 
 void RenderWidgetHostViewAndroid::SendGestureEvent(
     const WebKit::WebGestureEvent& event) {
+  // Sending a gesture that may trigger overscroll should resume the effect.
+  if (overscroll_effect_)
+    overscroll_effect_->SetEnabled(true);
+
   if (host_)
     host_->ForwardGestureEvent(event);
 }
 
 void RenderWidgetHostViewAndroid::SelectRange(const gfx::Point& start,
                                               const gfx::Point& end) {
   if (host_)
     host_->SelectRange(start, end);
 }
 
@@ skipping 47 matching lines @@
 }
 
 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
   return cached_background_color_;
 }
 
 void RenderWidgetHostViewAndroid::OnOverscrolled(
     gfx::Vector2dF accumulated_overscroll,
     gfx::Vector2dF current_fling_velocity) {
   CreateOverscrollEffectIfNecessary();
-  if (!overscroll_effect_ || !HasFocus())
+  if (!overscroll_effect_)
     return;
 
   overscroll_effect_->OnOverscrolled(base::TimeTicks::Now(),
                                      accumulated_overscroll,
                                      current_fling_velocity);
   ScheduleAnimationIfNecessary();
 }
 
 void RenderWidgetHostViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
@@ skipping 59 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content