Separate SwipeRefreshHandler and ContentViewCore

content/browser/renderer_host/render_widget_host_view_android.cc

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 c0daedb3742ad67bd53a166e75877f14c7c4db38..da6d326781c447d44da709441fecfc80131703b8 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -55,6 +55,7 @@
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu_host_messages.h"
@@ -77,6 +78,7 @@
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/android/delegated_frame_host_android.h"
+#include "ui/android/overscroll_refresh_handler.h"

[boliu, 2016/12/06 00:58:16]

ditto, forward declare should be enough it seems

[rlanday, 2016/12/06 03:25:26]

If I take out the header it still compiles, must be getting either a forward
declaration or the header from one of the other includes

 #include "ui/android/window_android.h"
 #include "ui/android/window_android_compositor.h"
 #include "ui/base/layout.h"
@@ -337,10 +339,12 @@ std::unique_ptr<ui::TouchSelectionController> CreateSelectionController(
 }
 
 std::unique_ptr<OverscrollControllerAndroid> CreateOverscrollController(
+    ui::OverscrollRefreshHandler* overscroll_refresh_handler,
     ContentViewCoreImpl* content_view_core,
     float dpi_scale) {
-  return base::MakeUnique<OverscrollControllerAndroid>(content_view_core,
-                                                       dpi_scale);
+  return base::MakeUnique<OverscrollControllerAndroid>(
+      overscroll_refresh_handler,
+      content_view_core->GetWindowAndroid()->GetCompositor(), dpi_scale);
 }
 
 gfx::RectF GetSelectionRect(const ui::TouchSelectionController& controller) {
@@ -469,6 +473,14 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
   host_->SetView(this);
   SetContentViewCore(content_view_core);
 
+  ui::OverscrollRefreshHandler* handler =
+      host_->delegate()->GetDelegateView()->GetOverscrollRefreshHandler();
+  if (handler) {
+    overscroll_controller_ = CreateOverscrollController(
+        handler, content_view_core_,
+        ui::GetScaleFactorForNativeView(GetNativeView()));
+  }
+
   if (GetTextInputManager())
     GetTextInputManager()->AddObserver(this);
 }
@@ -1220,6 +1232,12 @@ void RenderWidgetHostViewAndroid::SetSynchronousCompositorClient(
   }
 }
 
+void RenderWidgetHostViewAndroid::OnSetOverscrollRefreshHandler() {
+  overscroll_controller_ = CreateOverscrollController(

[boliu, 2016/12/06 00:58:16]

hmm, DCHECK(!overscroll_controller_) first, to make sure we are not overwriting
an existing one?

[rlanday, 2016/12/06 03:25:26]

Ok (would it be a problem if we were?)

+      host_->delegate()->GetDelegateView()->GetOverscrollRefreshHandler(),
+      content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
+}
+
 bool RenderWidgetHostViewAndroid::SupportsAnimation() const {
   // The synchronous (WebView) compositor does not have a proper browser
   // compositor with which to drive animations.
@@ -1815,12 +1833,6 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
 
   if (!selection_controller_)
     selection_controller_ = CreateSelectionController(this, content_view_core_);
-
-  if (!overscroll_controller_ &&
-      view_.GetWindowAndroid()->GetCompositor()) {
-    overscroll_controller_ = CreateOverscrollController(
-        content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
-  }
 }
 
 void RenderWidgetHostViewAndroid::RunAckCallbacks() {
@@ -1884,9 +1896,15 @@ void RenderWidgetHostViewAndroid::OnDetachedFromWindow() {
 
 void RenderWidgetHostViewAndroid::OnAttachCompositor() {
   DCHECK(content_view_core_);
-  if (!overscroll_controller_)
-    overscroll_controller_ = CreateOverscrollController(
-        content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
+  if (!overscroll_controller_) {
+    ui::OverscrollRefreshHandler* handler =
+        host_->delegate()->GetDelegateView()->GetOverscrollRefreshHandler();
+    if (handler) {
+      overscroll_controller_ = CreateOverscrollController(
+          handler, content_view_core_,
+          ui::GetScaleFactorForNativeView(GetNativeView()));
+    }
+  }
   ui::WindowAndroidCompositor* compositor =
       view_.GetWindowAndroid()->GetCompositor();
   delegated_frame_host_->RegisterFrameSinkHierarchy(