Hook ScrollElasticityController to InputHandlerProxy

content/renderer/input/input_handler_proxy.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_
 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/input_handler.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
 #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
 #include "third_party/WebKit/public/web/WebActiveWheelFlingParameters.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace content {
 
 class InputHandlerProxyClient;
+class InputScrollElasticityController;
 
 // This class is a proxy between the content input event filtering and the
 // compositor's input handling logic. InputHandlerProxy instances live entirely
 // on the compositor thread. Each InputHandler instance handles input events
 // intended for a specific WebWidget.
 class CONTENT_EXPORT InputHandlerProxy
     : public cc::InputHandlerClient,
       public NON_EXPORTED_BASE(blink::WebGestureCurveTarget) {
  public:
   InputHandlerProxy(cc::InputHandler* input_handler,
@@ skipping 95 matching lines @@
   bool disallow_horizontal_fling_scroll_;
   bool disallow_vertical_fling_scroll_;
 
   // Whether an active fling has seen an |Animate()| call. This is useful for
   // determining if the fling start time should be re-initialized.
   bool has_fling_animation_started_;
 
   // Non-zero only within the scope of |scrollBy|.
   gfx::Vector2dF current_fling_velocity_;
 
+  // Used to animate rubber-band over-scroll effect on Mac.
+  scoped_ptr<InputScrollElasticityController> scroll_elasticity_controller_;
+
   bool smooth_scroll_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_