| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 point.position = WebFloatPoint(x, y); | 282 point.position = WebFloatPoint(x, y); |
| 283 return point; | 283 return point; |
| 284 } | 284 } |
| 285 | 285 |
| 286 const cc::InputHandler::ScrollStatus kImplThreadScrollState( | 286 const cc::InputHandler::ScrollStatus kImplThreadScrollState( |
| 287 cc::InputHandler::SCROLL_ON_IMPL_THREAD, | 287 cc::InputHandler::SCROLL_ON_IMPL_THREAD, |
| 288 cc::MainThreadScrollingReason::kNotScrollingOnMain); | 288 cc::MainThreadScrollingReason::kNotScrollingOnMain); |
| 289 | 289 |
| 290 const cc::InputHandler::ScrollStatus kMainThreadScrollState( | 290 const cc::InputHandler::ScrollStatus kMainThreadScrollState( |
| 291 cc::InputHandler::SCROLL_ON_MAIN_THREAD, | 291 cc::InputHandler::SCROLL_ON_MAIN_THREAD, |
| 292 cc::MainThreadScrollingReason::kEventHandlers); | 292 cc::MainThreadScrollingReason::kNotScrollingOnMain); |
| 293 | 293 |
| 294 const cc::InputHandler::ScrollStatus kScrollIgnoredScrollState( | 294 const cc::InputHandler::ScrollStatus kScrollIgnoredScrollState( |
| 295 cc::InputHandler::SCROLL_IGNORED, | 295 cc::InputHandler::SCROLL_IGNORED, |
| 296 cc::MainThreadScrollingReason::kNotScrollable); | 296 cc::MainThreadScrollingReason::kNotScrollable); |
| 297 | 297 |
| 298 class TestInputHandlerProxy : public InputHandlerProxy { | 298 class TestInputHandlerProxy : public InputHandlerProxy { |
| 299 public: | 299 public: |
| 300 TestInputHandlerProxy(cc::InputHandler* input_handler, | 300 TestInputHandlerProxy(cc::InputHandler* input_handler, |
| 301 InputHandlerProxyClient* client) | 301 InputHandlerProxyClient* client) |
| 302 : InputHandlerProxy(input_handler, client) {} | 302 : InputHandlerProxy(input_handler, client) {} |
| (...skipping 2511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2814 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), | 2814 testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1), |
| 2815 base::Bucket(5, 1), base::Bucket(14, 1))); | 2815 base::Bucket(5, 1), base::Bucket(14, 1))); |
| 2816 } | 2816 } |
| 2817 | 2817 |
| 2818 | 2818 |
| 2819 INSTANTIATE_TEST_CASE_P(AnimateInput, | 2819 INSTANTIATE_TEST_CASE_P(AnimateInput, |
| 2820 InputHandlerProxyTest, | 2820 InputHandlerProxyTest, |
| 2821 testing::ValuesIn(test_types)); | 2821 testing::ValuesIn(test_types)); |
| 2822 } // namespace test | 2822 } // namespace test |
| 2823 } // namespace ui | 2823 } // namespace ui |
| OLD | NEW |