| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_scroll_elasticity_controller.h" | 5 #include "ui/events/blink/input_scroll_elasticity_controller.h" |
| 6 | 6 |
| 7 #include "cc/input/input_handler.h" | 7 #include "cc/input/input_handler.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 9 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
| 10 | 10 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 class ScrollElasticityControllerTest : public testing::Test { | 80 class ScrollElasticityControllerTest : public testing::Test { |
| 81 public: | 81 public: |
| 82 ScrollElasticityControllerTest() | 82 ScrollElasticityControllerTest() |
| 83 : controller_(&helper_), | 83 : controller_(&helper_), |
| 84 input_event_count_(0), | 84 input_event_count_(0), |
| 85 current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {} | 85 current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {} |
| 86 ~ScrollElasticityControllerTest() override {} | 86 ~ScrollElasticityControllerTest() override {} |
| 87 | 87 |
| 88 | 88 |
| 89 void SendGestureScrollBegin(InertialPhaseState inertialPhase) { | 89 void SendGestureScrollBegin(InertialPhaseState inertialPhase) { |
| 90 blink::WebGestureEvent event; | 90 TickCurrentTime(); |
| 91 blink::WebGestureEvent event( |
| 92 blink::WebInputEvent::GestureScrollBegin, |
| 93 blink::WebInputEvent::NoModifiers, |
| 94 (current_time_ - base::TimeTicks()).InSecondsF()); |
| 91 event.sourceDevice = blink::WebGestureDeviceTouchpad; | 95 event.sourceDevice = blink::WebGestureDeviceTouchpad; |
| 92 event.type = blink::WebInputEvent::GestureScrollBegin; | |
| 93 event.data.scrollBegin.inertialPhase = | 96 event.data.scrollBegin.inertialPhase = |
| 94 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); | 97 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); |
| 95 TickCurrentTime(); | |
| 96 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF(); | |
| 97 | 98 |
| 98 controller_.ObserveGestureEventAndResult(event, | 99 controller_.ObserveGestureEventAndResult(event, |
| 99 cc::InputHandlerScrollResult()); | 100 cc::InputHandlerScrollResult()); |
| 100 input_event_count_ += 1; | 101 input_event_count_ += 1; |
| 101 } | 102 } |
| 102 | 103 |
| 103 void SendGestureScrollUpdate( | 104 void SendGestureScrollUpdate( |
| 104 InertialPhaseState inertialPhase, | 105 InertialPhaseState inertialPhase, |
| 105 const gfx::Vector2dF& event_delta = gfx::Vector2dF(), | 106 const gfx::Vector2dF& event_delta = gfx::Vector2dF(), |
| 106 const gfx::Vector2dF& overscroll_delta = gfx::Vector2dF()) { | 107 const gfx::Vector2dF& overscroll_delta = gfx::Vector2dF()) { |
| 107 blink::WebGestureEvent event; | 108 TickCurrentTime(); |
| 109 blink::WebGestureEvent event( |
| 110 blink::WebInputEvent::GestureScrollUpdate, |
| 111 blink::WebInputEvent::NoModifiers, |
| 112 (current_time_ - base::TimeTicks()).InSecondsF()); |
| 108 event.sourceDevice = blink::WebGestureDeviceTouchpad; | 113 event.sourceDevice = blink::WebGestureDeviceTouchpad; |
| 109 event.type = blink::WebInputEvent::GestureScrollUpdate; | |
| 110 event.data.scrollUpdate.inertialPhase = | 114 event.data.scrollUpdate.inertialPhase = |
| 111 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); | 115 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); |
| 112 event.data.scrollUpdate.deltaX = -event_delta.x(); | 116 event.data.scrollUpdate.deltaX = -event_delta.x(); |
| 113 event.data.scrollUpdate.deltaY = -event_delta.y(); | 117 event.data.scrollUpdate.deltaY = -event_delta.y(); |
| 114 TickCurrentTime(); | |
| 115 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF(); | |
| 116 | 118 |
| 117 cc::InputHandlerScrollResult scroll_result; | 119 cc::InputHandlerScrollResult scroll_result; |
| 118 scroll_result.did_overscroll_root = !overscroll_delta.IsZero(); | 120 scroll_result.did_overscroll_root = !overscroll_delta.IsZero(); |
| 119 scroll_result.unused_scroll_delta = overscroll_delta; | 121 scroll_result.unused_scroll_delta = overscroll_delta; |
| 120 | 122 |
| 121 controller_.ObserveGestureEventAndResult(event, scroll_result); | 123 controller_.ObserveGestureEventAndResult(event, scroll_result); |
| 122 input_event_count_ += 1; | 124 input_event_count_ += 1; |
| 123 } | 125 } |
| 124 | 126 |
| 125 void SendGestureScrollEnd() { | 127 void SendGestureScrollEnd() { |
| 126 blink::WebGestureEvent event; | 128 TickCurrentTime(); |
| 129 blink::WebGestureEvent event( |
| 130 blink::WebInputEvent::GestureScrollEnd, |
| 131 blink::WebInputEvent::NoModifiers, |
| 132 (current_time_ - base::TimeTicks()).InSecondsF()); |
| 127 event.sourceDevice = blink::WebGestureDeviceTouchpad; | 133 event.sourceDevice = blink::WebGestureDeviceTouchpad; |
| 128 event.type = blink::WebInputEvent::GestureScrollEnd; | |
| 129 | |
| 130 TickCurrentTime(); | |
| 131 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF(); | |
| 132 | 134 |
| 133 controller_.ObserveGestureEventAndResult(event, | 135 controller_.ObserveGestureEventAndResult(event, |
| 134 cc::InputHandlerScrollResult()); | 136 cc::InputHandlerScrollResult()); |
| 135 input_event_count_ += 1; | 137 input_event_count_ += 1; |
| 136 } | 138 } |
| 137 | 139 |
| 138 const base::TimeTicks& TickCurrentTime() { | 140 const base::TimeTicks& TickCurrentTime() { |
| 139 current_time_ += base::TimeDelta::FromSecondsD(1 / 60.f); | 141 current_time_ += base::TimeDelta::FromSecondsD(1 / 60.f); |
| 140 return current_time_; | 142 return current_time_; |
| 141 } | 143 } |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 TickCurrentTimeAndAnimate(); | 417 TickCurrentTimeAndAnimate(); |
| 416 if (helper_.StretchAmount().IsZero()) | 418 if (helper_.StretchAmount().IsZero()) |
| 417 break; | 419 break; |
| 418 ticks_to_zero += 1; | 420 ticks_to_zero += 1; |
| 419 } | 421 } |
| 420 EXPECT_GT(ticks_to_zero, 3); | 422 EXPECT_GT(ticks_to_zero, 3); |
| 421 } | 423 } |
| 422 | 424 |
| 423 } // namespace | 425 } // namespace |
| 424 } // namespace ui | 426 } // namespace ui |
| OLD | NEW |