| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ | 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ |
| 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ | 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 return gesture_scroll_on_impl_thread_; | 56 return gesture_scroll_on_impl_thread_; |
| 57 } | 57 } |
| 58 | 58 |
| 59 private: | 59 private: |
| 60 EventDisposition HandleGestureFling(const blink::WebGestureEvent& event); | 60 EventDisposition HandleGestureFling(const blink::WebGestureEvent& event); |
| 61 | 61 |
| 62 // Returns true if we scrolled by the increment. | 62 // Returns true if we scrolled by the increment. |
| 63 bool TouchpadFlingScroll(const blink::WebFloatSize& increment); | 63 bool TouchpadFlingScroll(const blink::WebFloatSize& increment); |
| 64 | 64 |
| 65 // Returns true if we actually had an active fling to cancel. | 65 // Returns true if we actually had an active fling to cancel. |
| 66 bool CancelCurrentFling(); | 66 bool CancelCurrentFling(bool send_fling_stopped_notification); |
| 67 | 67 |
| 68 scoped_ptr<blink::WebGestureCurve> fling_curve_; | 68 scoped_ptr<blink::WebGestureCurve> fling_curve_; |
| 69 // Parameters for the active fling animation, stored in case we need to | 69 // Parameters for the active fling animation, stored in case we need to |
| 70 // transfer it out later. | 70 // transfer it out later. |
| 71 blink::WebActiveWheelFlingParameters fling_parameters_; | 71 blink::WebActiveWheelFlingParameters fling_parameters_; |
| 72 | 72 |
| 73 InputHandlerProxyClient* client_; | 73 InputHandlerProxyClient* client_; |
| 74 cc::InputHandler* input_handler_; | 74 cc::InputHandler* input_handler_; |
| 75 | 75 |
| 76 #ifndef NDEBUG | 76 #ifndef NDEBUG |
| (...skipping 10 matching lines...) Expand all Loading... |
| 87 // will be disabled. | 87 // will be disabled. |
| 88 bool disallow_horizontal_fling_scroll_; | 88 bool disallow_horizontal_fling_scroll_; |
| 89 bool disallow_vertical_fling_scroll_; | 89 bool disallow_vertical_fling_scroll_; |
| 90 | 90 |
| 91 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); | 91 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |
| 92 }; | 92 }; |
| 93 | 93 |
| 94 } // namespace content | 94 } // namespace content |
| 95 | 95 |
| 96 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ | 96 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_PROXY_H_ |
| OLD | NEW |