Hook ScrollElasticityController to InputHandlerProxy

content/renderer/input/input_scroll_elasticity_controller.cc

 // Copyright 2014 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/renderer/input/input_scroll_elasticity_controller.h"
 
 #include <math.h>
 
-// ScrollElasticityController and ScrollElasticityControllerClient are based on
-// WebKit/Source/platform/mac/ScrollElasticityController.mm
+// InputScrollElasticityController is based on
+// WebKit/Source/platform/mac/InputScrollElasticityController.mm
 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 60 matching lines @@
     // multiplier = [[NSUserDefaults standardUserDefaults]
     //     floatForKey:@"NSScrollWheelMultiplier"];
     if (multiplier <= 0)
       multiplier = 1;
   }
   return multiplier;
 }
 
 }  // namespace
 
-ScrollElasticityController::ScrollElasticityController(
-    ScrollElasticityControllerClient* client)
-    : client_(client),
+InputScrollElasticityController::InputScrollElasticityController(
+    cc::ScrollElasticityHelper* helper)
+    : helper_(helper),
       in_scroll_gesture_(false),
       has_scrolled_(false),
       momentum_scroll_in_progress_(false),
       ignore_momentum_scrolls_(false),
       last_momentum_scroll_timestamp_(0),
-      snap_rubberband_timer_is_active_(false) {
+      snap_rubberband_timer_is_active_(false),
+      weak_factory_(this) {
 }
 
-bool ScrollElasticityController::HandleWheelEvent(
+InputScrollElasticityController::~InputScrollElasticityController() {
+}
+
+base::WeakPtr<InputScrollElasticityController>
+InputScrollElasticityController::GetWeakPtr() {
+  if (helper_)
+    return weak_factory_.GetWeakPtr();
+  return base::WeakPtr<InputScrollElasticityController>();
+}
+
+void InputScrollElasticityController::Animate(base::TimeTicks time) {
+  if (!snap_rubberband_timer_is_active_)
+    return;
+
+  // TODO(ccameron): This should send the time parameter to the snap function,
+  // so that animation can be based on frame time, not arbitrarily-sampled
+  // clock time.
+  SnapRubberbandTimerFired();
+}
+
+void InputScrollElasticityController::ObserveWheelEventAndResult(
+    const blink::WebMouseWheelEvent& wheel_event,
+    const cc::InputHandlerScrollResult& scroll_result) {
+  // TODO(ccameron): Pull non-over-scrolling scroll logic out of
+  // HandleWheelEvent, and read the scroll result instead.
+  HandleWheelEvent(wheel_event);
+}
+
+bool InputScrollElasticityController::HandleWheelEvent(
     const blink::WebMouseWheelEvent& wheel_event) {
   if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseMayBegin)
     return false;
 
   if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseBegan) {
     in_scroll_gesture_ = true;
     has_scrolled_ = false;
     momentum_scroll_in_progress_ = false;
     ignore_momentum_scrolls_ = false;
     last_momentum_scroll_timestamp_ = 0;
     momentum_velocity_ = gfx::Vector2dF();
 
-    gfx::Vector2dF stretch_amount = client_->StretchAmount();
+    gfx::Vector2dF stretch_amount = helper_->StretchAmount();
     stretch_scroll_force_.set_x(
         ReboundDeltaForElasticDelta(stretch_amount.x()));
     stretch_scroll_force_.set_y(
         ReboundDeltaForElasticDelta(stretch_amount.y()));
     overflow_scroll_delta_ = gfx::Vector2dF();
 
     StopSnapRubberbandTimer();
 
     // TODO(erikchen): Use the commented out line once Chromium uses the
     // return value correctly.
     // crbug.com/375512
     // return ShouldHandleEvent(wheel_event);
 
     // This logic is incorrect, since diagonal wheel events are not consumed.
-    if (client_->PinnedInDirection(gfx::Vector2dF(-wheel_event.deltaX, 0))) {
+    if (helper_->PinnedInDirection(gfx::Vector2dF(-wheel_event.deltaX, 0))) {
       if (wheel_event.deltaX > 0 && !wheel_event.canRubberbandLeft)
         return false;
       if (wheel_event.deltaX < 0 && !wheel_event.canRubberbandRight)
         return false;
     }
 
     return true;
   }
 
   if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseEnded ||
@@ skipping 18 matching lines @@
 
   float delta_x = overflow_scroll_delta_.x() - wheel_event.deltaX;
   float delta_y = overflow_scroll_delta_.y() - wheel_event.deltaY;
   float event_coalesced_delta_x = -wheel_event.deltaX;
   float event_coalesced_delta_y = -wheel_event.deltaY;
 
   // Reset overflow values because we may decide to remove delta at various
   // points and put it into overflow.
   overflow_scroll_delta_ = gfx::Vector2dF();
 
-  gfx::Vector2dF stretch_amount = client_->StretchAmount();
+  gfx::Vector2dF stretch_amount = helper_->StretchAmount();
   bool is_vertically_stretched = stretch_amount.y() != 0.f;
   bool is_horizontally_stretched = stretch_amount.x() != 0.f;
 
   // Slightly prefer scrolling vertically by applying the = case to delta_y
   if (fabsf(delta_y) >= fabsf(delta_x))
     delta_x = 0;
   else
     delta_y = 0;
 
   bool should_stretch = false;
@@ skipping 19 matching lines @@
       momentum_velocity_.set_x(event_coalesced_delta_x / (float)time_delta);
       momentum_velocity_.set_y(event_coalesced_delta_y / (float)time_delta);
       last_momentum_scroll_timestamp_ = wheel_event.timeStampSeconds;
     } else {
       last_momentum_scroll_timestamp_ = wheel_event.timeStampSeconds;
       momentum_velocity_ = gfx::Vector2dF();
     }
 
     if (is_vertically_stretched) {
       if (!is_horizontally_stretched &&
-          client_->PinnedInDirection(gfx::Vector2dF(delta_x, 0))) {
+          helper_->PinnedInDirection(gfx::Vector2dF(delta_x, 0))) {
         // Stretching only in the vertical.
         if (delta_y != 0 &&
             (fabsf(delta_x / delta_y) < kRubberbandDirectionLockStretchRatio))
           delta_x = 0;
         else if (fabsf(delta_x) <
                  kRubberbandMinimumRequiredDeltaBeforeStretch) {
           overflow_scroll_delta_.set_x(overflow_scroll_delta_.x() + delta_x);
           delta_x = 0;
         } else
           overflow_scroll_delta_.set_x(overflow_scroll_delta_.x() + delta_x);
       }
     } else if (is_horizontally_stretched) {
       // Stretching only in the horizontal.
-      if (client_->PinnedInDirection(gfx::Vector2dF(0, delta_y))) {
+      if (helper_->PinnedInDirection(gfx::Vector2dF(0, delta_y))) {
         if (delta_x != 0 &&
             (fabsf(delta_y / delta_x) < kRubberbandDirectionLockStretchRatio))
           delta_y = 0;
         else if (fabsf(delta_y) <
                  kRubberbandMinimumRequiredDeltaBeforeStretch) {
           overflow_scroll_delta_.set_y(overflow_scroll_delta_.y() + delta_y);
           delta_y = 0;
         } else
           overflow_scroll_delta_.set_y(overflow_scroll_delta_.y() + delta_y);
       }
     } else {
       // Not stretching at all yet.
-      if (client_->PinnedInDirection(gfx::Vector2dF(delta_x, delta_y))) {
+      if (helper_->PinnedInDirection(gfx::Vector2dF(delta_x, delta_y))) {
         if (fabsf(delta_y) >= fabsf(delta_x)) {
           if (fabsf(delta_x) < kRubberbandMinimumRequiredDeltaBeforeStretch) {
             overflow_scroll_delta_.set_x(overflow_scroll_delta_.x() + delta_x);
             delta_x = 0;
           } else
             overflow_scroll_delta_.set_x(overflow_scroll_delta_.x() + delta_x);
         }
         should_stretch = true;
       }
     }
   }
 
   if (delta_x != 0 || delta_y != 0) {
     has_scrolled_ = true;
     if (!(should_stretch || is_vertically_stretched ||
           is_horizontally_stretched)) {
       if (delta_y != 0) {
         delta_y *= ScrollWheelMultiplier();
-        client_->ImmediateScrollBy(gfx::Vector2dF(0, delta_y));
+        helper_->ImmediateScrollBy(gfx::Vector2dF(0, delta_y));
       }
       if (delta_x != 0) {
         delta_x *= ScrollWheelMultiplier();
-        client_->ImmediateScrollBy(gfx::Vector2dF(delta_x, 0));
+        helper_->ImmediateScrollBy(gfx::Vector2dF(delta_x, 0));
       }
     } else {
-      if (!client_->AllowsHorizontalStretching()) {
+      if (!helper_->AllowsHorizontalStretching()) {
         delta_x = 0;
         event_coalesced_delta_x = 0;
       } else if ((delta_x != 0) && !is_horizontally_stretched &&
-                 !client_->PinnedInDirection(gfx::Vector2dF(delta_x, 0))) {
+                 !helper_->PinnedInDirection(gfx::Vector2dF(delta_x, 0))) {
         delta_x *= ScrollWheelMultiplier();
 
-        client_->ImmediateScrollByWithoutContentEdgeConstraints(
+        helper_->ImmediateScrollByWithoutContentEdgeConstraints(
             gfx::Vector2dF(delta_x, 0));
         delta_x = 0;
       }
 
-      if (!client_->AllowsVerticalStretching()) {
+      if (!helper_->AllowsVerticalStretching()) {
         delta_y = 0;
         event_coalesced_delta_y = 0;
       } else if ((delta_y != 0) && !is_vertically_stretched &&
-                 !client_->PinnedInDirection(gfx::Vector2dF(0, delta_y))) {
+                 !helper_->PinnedInDirection(gfx::Vector2dF(0, delta_y))) {
         delta_y *= ScrollWheelMultiplier();
 
-        client_->ImmediateScrollByWithoutContentEdgeConstraints(
+        helper_->ImmediateScrollByWithoutContentEdgeConstraints(
             gfx::Vector2dF(0, delta_y));
         delta_y = 0;
       }
 
-      gfx::Vector2dF stretch_amount = client_->StretchAmount();
+      gfx::Vector2dF stretch_amount = helper_->StretchAmount();
 
       if (momentum_scroll_in_progress_) {
-        if ((client_->PinnedInDirection(gfx::Vector2dF(
+        if ((helper_->PinnedInDirection(gfx::Vector2dF(
                  event_coalesced_delta_x, event_coalesced_delta_y)) ||
              (fabsf(event_coalesced_delta_x) + fabsf(event_coalesced_delta_y) <=
               0)) &&
             last_momentum_scroll_timestamp_) {
           ignore_momentum_scrolls_ = true;
           momentum_scroll_in_progress_ = false;
           SnapRubberband();
         }
       }
 
       stretch_scroll_force_.set_x(stretch_scroll_force_.x() + delta_x);
       stretch_scroll_force_.set_y(stretch_scroll_force_.y() + delta_y);
 
       gfx::Vector2dF damped_delta(
           ceilf(ElasticDeltaForReboundDelta(stretch_scroll_force_.x())),
           ceilf(ElasticDeltaForReboundDelta(stretch_scroll_force_.y())));
 
-      client_->ImmediateScrollByWithoutContentEdgeConstraints(damped_delta -
+      helper_->ImmediateScrollByWithoutContentEdgeConstraints(damped_delta -
                                                               stretch_amount);
     }
   }
 
   if (momentum_scroll_in_progress_ &&
       momentum_phase == blink::WebMouseWheelEvent::PhaseEnded) {
     momentum_scroll_in_progress_ = false;
     ignore_momentum_scrolls_ = false;
     last_momentum_scroll_timestamp_ = 0;
   }
@@ skipping 10 matching lines @@
 float RoundToDevicePixelTowardZero(float num) {
   float rounded_num = roundf(num);
   if (fabs(num - rounded_num) < 0.125)
     num = rounded_num;
 
   return RoundTowardZero(num);
 }
 
 }  // namespace
 
-void ScrollElasticityController::SnapRubberbandTimerFired() {
+void InputScrollElasticityController::SnapRubberbandTimerFired() {
   if (!momentum_scroll_in_progress_ || ignore_momentum_scrolls_) {
     float time_delta = (base::Time::Now() - start_time_).InSecondsF();
 
     if (start_stretch_ == gfx::Vector2dF()) {
-      start_stretch_ = client_->StretchAmount();
+      start_stretch_ = helper_->StretchAmount();
       if (start_stretch_ == gfx::Vector2dF()) {
         StopSnapRubberbandTimer();
 
         stretch_scroll_force_ = gfx::Vector2dF();
         start_time_ = base::Time();
         orig_origin_ = gfx::Vector2dF();
         orig_velocity_ = gfx::Vector2dF();
         return;
       }
 
-      orig_origin_ = client_->AbsoluteScrollPosition() - start_stretch_;
+      orig_origin_ = helper_->AbsoluteScrollPosition() - start_stretch_;
       orig_velocity_ = momentum_velocity_;
 
       // Just like normal scrolling, prefer vertical rubberbanding
       if (fabsf(orig_velocity_.y()) >= fabsf(orig_velocity_.x()))
         orig_velocity_.set_x(0);
 
       // Don't rubber-band horizontally if it's not possible to scroll
       // horizontally
-      if (!client_->CanScrollHorizontally())
+      if (!helper_->CanScrollHorizontally())
         orig_velocity_.set_x(0);
 
       // Don't rubber-band vertically if it's not possible to scroll
       // vertically
-      if (!client_->CanScrollVertically())
+      if (!helper_->CanScrollVertically())
         orig_velocity_.set_y(0);
     }
 
     gfx::Vector2dF delta(
         RoundToDevicePixelTowardZero(ElasticDeltaForTimeDelta(
             start_stretch_.x(), -orig_velocity_.x(), time_delta)),
         RoundToDevicePixelTowardZero(ElasticDeltaForTimeDelta(
             start_stretch_.y(), -orig_velocity_.y(), time_delta)));
 
     if (fabs(delta.x()) >= 1 || fabs(delta.y()) >= 1) {
-      client_->ImmediateScrollByWithoutContentEdgeConstraints(
-          gfx::Vector2dF(delta.x(), delta.y()) - client_->StretchAmount());
+      helper_->ImmediateScrollByWithoutContentEdgeConstraints(
+          gfx::Vector2dF(delta.x(), delta.y()) - helper_->StretchAmount());
 
-      gfx::Vector2dF new_stretch = client_->StretchAmount();
+      gfx::Vector2dF new_stretch = helper_->StretchAmount();
 
       stretch_scroll_force_.set_x(ReboundDeltaForElasticDelta(new_stretch.x()));
       stretch_scroll_force_.set_y(ReboundDeltaForElasticDelta(new_stretch.y()));
     } else {
-      client_->AdjustScrollPositionToBoundsIfNecessary();
+      helper_->AdjustScrollPositionToBoundsIfNecessary();
 
       StopSnapRubberbandTimer();
       stretch_scroll_force_ = gfx::Vector2dF();
       start_time_ = base::Time();
       start_stretch_ = gfx::Vector2dF();
       orig_origin_ = gfx::Vector2dF();
       orig_velocity_ = gfx::Vector2dF();
     }
   } else {
     start_time_ = base::Time::Now();
     start_stretch_ = gfx::Vector2dF();
   }
+
+  helper_->SnapRubberbandTimerFired();
 }
 
-bool ScrollElasticityController::IsRubberbandInProgress() const {
+bool InputScrollElasticityController::IsRubberbandInProgress() const {
   if (!in_scroll_gesture_ && !momentum_scroll_in_progress_ &&
       !snap_rubberband_timer_is_active_)
     return false;
 
-  return !client_->StretchAmount().IsZero();
+  return !helper_->StretchAmount().IsZero();
 }
 
-void ScrollElasticityController::StopSnapRubberbandTimer() {
-  client_->StopSnapRubberbandTimer();
+void InputScrollElasticityController::StopSnapRubberbandTimer() {
+  helper_->StopSnapRubberbandTimer();
   snap_rubberband_timer_is_active_ = false;
 }
 
-void ScrollElasticityController::SnapRubberband() {
+void InputScrollElasticityController::SnapRubberband() {
   double time_delta = SystemUptime() - last_momentum_scroll_timestamp_;
   if (last_momentum_scroll_timestamp_ &&
       time_delta >= kScrollVelocityZeroingTimeout)
     momentum_velocity_ = gfx::Vector2dF();
 
   in_scroll_gesture_ = false;
 
   if (snap_rubberband_timer_is_active_)
     return;
 
   start_stretch_ = gfx::Vector2dF();
   orig_origin_ = gfx::Vector2dF();
   orig_velocity_ = gfx::Vector2dF();
 
   // If there's no momentum scroll or stretch amount, no need to start the
   // timer.
   if (!momentum_scroll_in_progress_ &&
-      client_->StretchAmount() == gfx::Vector2dF()) {
+      helper_->StretchAmount() == gfx::Vector2dF()) {
     start_time_ = base::Time();
     stretch_scroll_force_ = gfx::Vector2dF();
     return;
   }
 
   start_time_ = base::Time::Now();
-  client_->StartSnapRubberbandTimer();
+  helper_->StartSnapRubberbandTimer();
   snap_rubberband_timer_is_active_ = true;
 }
 
-bool ScrollElasticityController::ShouldHandleEvent(
+bool InputScrollElasticityController::ShouldHandleEvent(
     const blink::WebMouseWheelEvent& wheel_event) {
   // Once any scrolling has happened, all future events should be handled.
   if (has_scrolled_)
     return true;
 
   // The event can't cause scrolling to start if its delta is 0.
   if (wheel_event.deltaX == 0 && wheel_event.deltaY == 0)
     return false;
 
-  // If the client isn't pinned, then the event is guaranteed to cause
+  // If the helper isn't pinned, then the event is guaranteed to cause
   // scrolling.
-  if (!client_->PinnedInDirection(gfx::Vector2dF(-wheel_event.deltaX, 0)))
+  if (!helper_->PinnedInDirection(gfx::Vector2dF(-wheel_event.deltaX, 0)))
     return true;
 
-  // If the event is pinned, then the client can't scroll, but it might rubber
+  // If the event is pinned, then the helper can't scroll, but it might rubber
   // band.
   // Check if the event allows rubber banding.
   if (wheel_event.deltaY == 0) {
     if (wheel_event.deltaX > 0 && !wheel_event.canRubberbandLeft)
       return false;
     if (wheel_event.deltaX < 0 && !wheel_event.canRubberbandRight)
       return false;
   }
 
   // The event is going to either cause scrolling or rubber banding.
   return true;
 }
 
 }  // namespace content