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 #include "content/renderer/input/input_handler_proxy.h" | 5 #include "content/renderer/input/input_handler_proxy.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "cc/base/swap_promise_monitor.h" | 9 #include "cc/base/swap_promise_monitor.h" |
10 #include "content/renderer/input/input_handler_proxy_client.h" | 10 #include "content/renderer/input/input_handler_proxy_client.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 MOCK_METHOD1(TransferActiveWheelFlingAnimation, | 122 MOCK_METHOD1(TransferActiveWheelFlingAnimation, |
123 void(const WebActiveWheelFlingParameters&)); | 123 void(const WebActiveWheelFlingParameters&)); |
124 | 124 |
125 virtual blink::WebGestureCurve* CreateFlingAnimationCurve( | 125 virtual blink::WebGestureCurve* CreateFlingAnimationCurve( |
126 int deviceSource, | 126 int deviceSource, |
127 const WebFloatPoint& velocity, | 127 const WebFloatPoint& velocity, |
128 const WebSize& cumulative_scroll) OVERRIDE { | 128 const WebSize& cumulative_scroll) OVERRIDE { |
129 return new FakeWebGestureCurve(velocity, cumulative_scroll); | 129 return new FakeWebGestureCurve(velocity, cumulative_scroll); |
130 } | 130 } |
131 | 131 |
132 virtual void DidOverscroll(const cc::DidOverscrollParams& params) {} | 132 virtual void DidOverscroll(const cc::DidOverscrollParams& params) OVERRIDE {} |
| 133 virtual void DidStopFlinging() OVERRIDE {} |
133 | 134 |
134 private: | 135 private: |
135 DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient); | 136 DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient); |
136 }; | 137 }; |
137 | 138 |
138 class InputHandlerProxyTest : public testing::Test { | 139 class InputHandlerProxyTest : public testing::Test { |
139 public: | 140 public: |
140 InputHandlerProxyTest() | 141 InputHandlerProxyTest() |
141 : expected_disposition_(InputHandlerProxy::DID_HANDLE) { | 142 : expected_disposition_(InputHandlerProxy::DID_HANDLE) { |
142 input_handler_.reset( | 143 input_handler_.reset( |
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 | 1214 |
1214 touch.touches[2].state = WebTouchPoint::StatePressed; | 1215 touch.touches[2].state = WebTouchPoint::StatePressed; |
1215 touch.touches[2].screenPosition = WebPoint(-10, 10); | 1216 touch.touches[2].screenPosition = WebPoint(-10, 10); |
1216 touch.touches[2].position = WebPoint(-10, 10); | 1217 touch.touches[2].position = WebPoint(-10, 10); |
1217 | 1218 |
1218 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(touch)); | 1219 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(touch)); |
1219 } | 1220 } |
1220 | 1221 |
1221 } // namespace | 1222 } // namespace |
1222 } // namespace content | 1223 } // namespace content |
OLD | NEW |