| 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 "ui/events/blink/input_handler_proxy.h" | 5 #include "ui/events/blink/input_handler_proxy.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/test/histogram_tester.h" | 10 #include "base/test/histogram_tester.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 MOCK_METHOD2(RootScrollBegin, | 121 MOCK_METHOD2(RootScrollBegin, |
| 122 ScrollStatus(cc::ScrollState*, | 122 ScrollStatus(cc::ScrollState*, |
| 123 cc::InputHandler::ScrollInputType type)); | 123 cc::InputHandler::ScrollInputType type)); |
| 124 MOCK_METHOD1(ScrollAnimatedBegin, | 124 MOCK_METHOD1(ScrollAnimatedBegin, |
| 125 ScrollStatus(const gfx::Point& viewport_point)); | 125 ScrollStatus(const gfx::Point& viewport_point)); |
| 126 MOCK_METHOD3(ScrollAnimated, | 126 MOCK_METHOD3(ScrollAnimated, |
| 127 ScrollStatus(const gfx::Point& viewport_point, | 127 ScrollStatus(const gfx::Point& viewport_point, |
| 128 const gfx::Vector2dF& scroll_delta, | 128 const gfx::Vector2dF& scroll_delta, |
| 129 base::TimeDelta)); | 129 base::TimeDelta)); |
| 130 MOCK_METHOD1(ScrollBy, cc::InputHandlerScrollResult(cc::ScrollState*)); | 130 MOCK_METHOD1(ScrollBy, cc::InputHandlerScrollResult(cc::ScrollState*)); |
| 131 MOCK_METHOD2(ScrollVerticallyByPage, | |
| 132 bool(const gfx::Point& viewport_point, | |
| 133 cc::ScrollDirection direction)); | |
| 134 MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*)); | 131 MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*)); |
| 135 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); | 132 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); |
| 136 | 133 |
| 137 std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( | 134 std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( |
| 138 ui::LatencyInfo* latency) override { | 135 ui::LatencyInfo* latency) override { |
| 139 return nullptr; | 136 return nullptr; |
| 140 } | 137 } |
| 141 | 138 |
| 142 cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override { | 139 cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override { |
| 143 return NULL; | 140 return NULL; |
| (...skipping 2670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2814 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), | 2811 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), |
| 2815 base::Bucket(5, 1), base::Bucket(14, 1))); | 2812 base::Bucket(5, 1), base::Bucket(14, 1))); |
| 2816 } | 2813 } |
| 2817 | 2814 |
| 2818 | 2815 |
| 2819 INSTANTIATE_TEST_CASE_P(AnimateInput, | 2816 INSTANTIATE_TEST_CASE_P(AnimateInput, |
| 2820 InputHandlerProxyTest, | 2817 InputHandlerProxyTest, |
| 2821 testing::ValuesIn(test_types)); | 2818 testing::ValuesIn(test_types)); |
| 2822 } // namespace test | 2819 } // namespace test |
| 2823 } // namespace ui | 2820 } // namespace ui |
| OLD | NEW |