| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 MOCK_METHOD0(ScrollEnd, void()); | 55 MOCK_METHOD0(ScrollEnd, void()); |
| 56 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); | 56 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); |
| 57 | 57 |
| 58 virtual scoped_ptr<cc::SwapPromiseMonitor> | 58 virtual scoped_ptr<cc::SwapPromiseMonitor> |
| 59 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE { | 59 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE { |
| 60 return scoped_ptr<cc::SwapPromiseMonitor>(); | 60 return scoped_ptr<cc::SwapPromiseMonitor>(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {} | 63 virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {} |
| 64 | 64 |
| 65 virtual void StartPageScaleAnimation(gfx::Vector2d target_offset, | 65 virtual void StartPageScaleAnimation(const gfx::Vector2d& target_offset, |
| 66 bool anchor_point, | 66 bool anchor_point, |
| 67 float page_scale, | 67 float page_scale, |
| 68 base::TimeDelta duration) OVERRIDE {} | 68 base::TimeDelta duration) OVERRIDE {} |
| 69 | 69 |
| 70 virtual void NotifyCurrentFlingVelocity( | 70 virtual void NotifyCurrentFlingVelocity( |
| 71 const gfx::Vector2dF& velocity) OVERRIDE {} | 71 const gfx::Vector2dF& velocity) OVERRIDE {} |
| 72 virtual void MouseMoveAt(gfx::Point mouse_position) OVERRIDE {} | 72 virtual void MouseMoveAt(gfx::Point mouse_position) OVERRIDE {} |
| 73 | 73 |
| 74 MOCK_METHOD1(HaveTouchEventHandlersAt, | 74 MOCK_METHOD1(HaveTouchEventHandlersAt, |
| 75 bool(gfx::Point point)); | 75 bool(gfx::Point point)); |
| (...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 | 1216 |
| 1217 touch.touches[2].state = WebTouchPoint::StatePressed; | 1217 touch.touches[2].state = WebTouchPoint::StatePressed; |
| 1218 touch.touches[2].screenPosition = WebPoint(-10, 10); | 1218 touch.touches[2].screenPosition = WebPoint(-10, 10); |
| 1219 touch.touches[2].position = WebPoint(-10, 10); | 1219 touch.touches[2].position = WebPoint(-10, 10); |
| 1220 | 1220 |
| 1221 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(touch)); | 1221 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(touch)); |
| 1222 } | 1222 } |
| 1223 | 1223 |
| 1224 } // namespace | 1224 } // namespace |
| 1225 } // namespace content | 1225 } // namespace content |
| OLD | NEW |