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/common/input/did_overscroll_params.h" | 10 #include "content/common/input/did_overscroll_params.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 MOCK_METHOD0(PinchGestureBegin, void()); | 79 MOCK_METHOD0(PinchGestureBegin, void()); |
80 MOCK_METHOD2(PinchGestureUpdate, | 80 MOCK_METHOD2(PinchGestureUpdate, |
81 void(float magnify_delta, const gfx::Point& anchor)); | 81 void(float magnify_delta, const gfx::Point& anchor)); |
82 MOCK_METHOD0(PinchGestureEnd, void()); | 82 MOCK_METHOD0(PinchGestureEnd, void()); |
83 | 83 |
84 MOCK_METHOD0(SetNeedsAnimate, void()); | 84 MOCK_METHOD0(SetNeedsAnimate, void()); |
85 | 85 |
86 MOCK_METHOD2(ScrollBegin, | 86 MOCK_METHOD2(ScrollBegin, |
87 ScrollStatus(const gfx::Point& viewport_point, | 87 ScrollStatus(const gfx::Point& viewport_point, |
88 cc::InputHandler::ScrollInputType type)); | 88 cc::InputHandler::ScrollInputType type)); |
| 89 MOCK_METHOD2(ScrollAnimated, |
| 90 ScrollStatus(const gfx::Point& viewport_point, |
| 91 const gfx::Vector2dF& scroll_delta)); |
89 MOCK_METHOD2(ScrollBy, | 92 MOCK_METHOD2(ScrollBy, |
90 bool(const gfx::Point& viewport_point, | 93 bool(const gfx::Point& viewport_point, |
91 const gfx::Vector2dF& scroll_delta)); | 94 const gfx::Vector2dF& scroll_delta)); |
92 MOCK_METHOD2(ScrollVerticallyByPage, | 95 MOCK_METHOD2(ScrollVerticallyByPage, |
93 bool(const gfx::Point& viewport_point, | 96 bool(const gfx::Point& viewport_point, |
94 cc::ScrollDirection direction)); | 97 cc::ScrollDirection direction)); |
95 MOCK_METHOD0(ScrollEnd, void()); | 98 MOCK_METHOD0(ScrollEnd, void()); |
96 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); | 99 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); |
97 | 100 |
98 virtual scoped_ptr<cc::SwapPromiseMonitor> | 101 virtual scoped_ptr<cc::SwapPromiseMonitor> |
(...skipping 1749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1848 testing::Property(&gfx::Vector2dF::x, | 1851 testing::Property(&gfx::Vector2dF::x, |
1849 testing::Eq(expected_delta)))) | 1852 testing::Eq(expected_delta)))) |
1850 .WillOnce(testing::Return(true)); | 1853 .WillOnce(testing::Return(true)); |
1851 input_handler_->Animate(time); | 1854 input_handler_->Animate(time); |
1852 | 1855 |
1853 VERIFY_AND_RESET_MOCKS(); | 1856 VERIFY_AND_RESET_MOCKS(); |
1854 } | 1857 } |
1855 | 1858 |
1856 } // namespace | 1859 } // namespace |
1857 } // namespace content | 1860 } // namespace content |
OLD | NEW |