Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: ui/events/blink/input_scroll_elasticity_controller_unittest.cc

Issue 2569273002: Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs. (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h" 10 #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 class ScrollElasticityControllerTest : public testing::Test { 81 class ScrollElasticityControllerTest : public testing::Test {
82 public: 82 public:
83 ScrollElasticityControllerTest() 83 ScrollElasticityControllerTest()
84 : controller_(&helper_), 84 : controller_(&helper_),
85 input_event_count_(0), 85 input_event_count_(0),
86 current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {} 86 current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {}
87 ~ScrollElasticityControllerTest() override {} 87 ~ScrollElasticityControllerTest() override {}
88 88
89 89
90 void SendGestureScrollBegin(InertialPhaseState inertialPhase) { 90 void SendGestureScrollBegin(InertialPhaseState inertialPhase) {
91 blink::WebGestureEvent event; 91 TickCurrentTime();
92 blink::WebGestureEvent event(
93 blink::WebInputEvent::GestureScrollBegin,
94 blink::WebInputEvent::NoModifiers,
95 (current_time_ - base::TimeTicks()).InSecondsF());
92 event.sourceDevice = blink::WebGestureDeviceTouchpad; 96 event.sourceDevice = blink::WebGestureDeviceTouchpad;
93 event.type = blink::WebInputEvent::GestureScrollBegin;
94 event.data.scrollBegin.inertialPhase = 97 event.data.scrollBegin.inertialPhase =
95 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); 98 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase);
96 TickCurrentTime();
97 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
98 99
99 controller_.ObserveGestureEventAndResult(event, 100 controller_.ObserveGestureEventAndResult(event,
100 cc::InputHandlerScrollResult()); 101 cc::InputHandlerScrollResult());
101 input_event_count_ += 1; 102 input_event_count_ += 1;
102 } 103 }
103 104
104 void SendGestureScrollUpdate( 105 void SendGestureScrollUpdate(
105 InertialPhaseState inertialPhase, 106 InertialPhaseState inertialPhase,
106 const gfx::Vector2dF& event_delta = gfx::Vector2dF(), 107 const gfx::Vector2dF& event_delta = gfx::Vector2dF(),
107 const gfx::Vector2dF& overscroll_delta = gfx::Vector2dF()) { 108 const gfx::Vector2dF& overscroll_delta = gfx::Vector2dF()) {
108 blink::WebGestureEvent event; 109 TickCurrentTime();
110 blink::WebGestureEvent event(
111 blink::WebInputEvent::GestureScrollUpdate,
112 blink::WebInputEvent::NoModifiers,
113 (current_time_ - base::TimeTicks()).InSecondsF());
109 event.sourceDevice = blink::WebGestureDeviceTouchpad; 114 event.sourceDevice = blink::WebGestureDeviceTouchpad;
110 event.type = blink::WebInputEvent::GestureScrollUpdate;
111 event.data.scrollUpdate.inertialPhase = 115 event.data.scrollUpdate.inertialPhase =
112 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase); 116 static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase);
113 event.data.scrollUpdate.deltaX = -event_delta.x(); 117 event.data.scrollUpdate.deltaX = -event_delta.x();
114 event.data.scrollUpdate.deltaY = -event_delta.y(); 118 event.data.scrollUpdate.deltaY = -event_delta.y();
115 TickCurrentTime();
116 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
117 119
118 cc::InputHandlerScrollResult scroll_result; 120 cc::InputHandlerScrollResult scroll_result;
119 scroll_result.did_overscroll_root = !overscroll_delta.IsZero(); 121 scroll_result.did_overscroll_root = !overscroll_delta.IsZero();
120 scroll_result.unused_scroll_delta = overscroll_delta; 122 scroll_result.unused_scroll_delta = overscroll_delta;
121 123
122 controller_.ObserveGestureEventAndResult(event, scroll_result); 124 controller_.ObserveGestureEventAndResult(event, scroll_result);
123 input_event_count_ += 1; 125 input_event_count_ += 1;
124 } 126 }
125 127
126 void SendGestureScrollEnd() { 128 void SendGestureScrollEnd() {
127 blink::WebGestureEvent event; 129 TickCurrentTime();
130 blink::WebGestureEvent event(
131 blink::WebInputEvent::GestureScrollEnd,
132 blink::WebInputEvent::NoModifiers,
133 (current_time_ - base::TimeTicks()).InSecondsF());
128 event.sourceDevice = blink::WebGestureDeviceTouchpad; 134 event.sourceDevice = blink::WebGestureDeviceTouchpad;
129 event.type = blink::WebInputEvent::GestureScrollEnd;
130
131 TickCurrentTime();
132 event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
133 135
134 controller_.ObserveGestureEventAndResult(event, 136 controller_.ObserveGestureEventAndResult(event,
135 cc::InputHandlerScrollResult()); 137 cc::InputHandlerScrollResult());
136 input_event_count_ += 1; 138 input_event_count_ += 1;
137 } 139 }
138 140
139 const base::TimeTicks& TickCurrentTime() { 141 const base::TimeTicks& TickCurrentTime() {
140 current_time_ += base::TimeDelta::FromSecondsD(1 / 60.f); 142 current_time_ += base::TimeDelta::FromSecondsD(1 / 60.f);
141 return current_time_; 143 return current_time_;
142 } 144 }
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 TickCurrentTimeAndAnimate(); 418 TickCurrentTimeAndAnimate();
417 if (helper_.StretchAmount().IsZero()) 419 if (helper_.StretchAmount().IsZero())
418 break; 420 break;
419 ticks_to_zero += 1; 421 ticks_to_zero += 1;
420 } 422 }
421 EXPECT_GT(ticks_to_zero, 3); 423 EXPECT_GT(ticks_to_zero, 3);
422 } 424 }
423 425
424 } // namespace 426 } // namespace
425 } // namespace ui 427 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698