| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 bool(const gfx::Point& viewport_point, | 116 bool(const gfx::Point& viewport_point, |
| 117 cc::ScrollDirection direction)); | 117 cc::ScrollDirection direction)); |
| 118 MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*)); | 118 MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*)); |
| 119 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); | 119 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); |
| 120 | 120 |
| 121 std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( | 121 std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( |
| 122 ui::LatencyInfo* latency) override { | 122 ui::LatencyInfo* latency) override { |
| 123 return std::unique_ptr<cc::SwapPromiseMonitor>(); | 123 return std::unique_ptr<cc::SwapPromiseMonitor>(); |
| 124 } | 124 } |
| 125 | 125 |
| 126 cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override { | 126 cc::ScrollElasticityHelper* CreateRootScrollElasticityHelper() override { |
| 127 return NULL; | 127 return nullptr; |
| 128 } |
| 129 base::WeakPtr<cc::ScrollElasticityHelper> |
| 130 ScrollElasticityHelperForScrollingLayer() override { |
| 131 return nullptr; |
| 132 } |
| 133 gfx::ScrollOffset GetScrollOffsetForLayer(int layer_id) override { |
| 134 return gfx::ScrollOffset(); |
| 135 } |
| 136 bool ScrollLayerTo(int layer_id, const gfx::ScrollOffset& offset) override { |
| 137 return false; |
| 128 } | 138 } |
| 129 | 139 |
| 130 void BindToClient(cc::InputHandlerClient* client) override {} | 140 void BindToClient(cc::InputHandlerClient* client) override {} |
| 131 | 141 |
| 132 void MouseMoveAt(const gfx::Point& mouse_position) override {} | 142 void MouseMoveAt(const gfx::Point& mouse_position) override {} |
| 133 | 143 |
| 134 MOCK_CONST_METHOD2(IsCurrentlyScrollingLayerAt, | 144 MOCK_CONST_METHOD2(IsCurrentlyScrollingLayerAt, |
| 135 bool(const gfx::Point& point, | 145 bool(const gfx::Point& point, |
| 136 cc::InputHandler::ScrollInputType type)); | 146 cc::InputHandler::ScrollInputType type)); |
| 137 | 147 |
| (...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2780 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), | 2790 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), |
| 2781 base::Bucket(5, 1), base::Bucket(14, 1))); | 2791 base::Bucket(5, 1), base::Bucket(14, 1))); |
| 2782 } | 2792 } |
| 2783 | 2793 |
| 2784 | 2794 |
| 2785 INSTANTIATE_TEST_CASE_P(AnimateInput, | 2795 INSTANTIATE_TEST_CASE_P(AnimateInput, |
| 2786 InputHandlerProxyTest, | 2796 InputHandlerProxyTest, |
| 2787 testing::ValuesIn(test_types)); | 2797 testing::ValuesIn(test_types)); |
| 2788 } // namespace test | 2798 } // namespace test |
| 2789 } // namespace ui | 2799 } // namespace ui |
| OLD | NEW |