Index: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
index d24e8bd59b9ef84cfad408783fe402bf255791c6..6b58195fc88a11fafe41de10e25bc1fcf2429a55 100644 |
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
@@ -51,6 +51,7 @@ class MouseWheelEventQueueTest : public testing::Test, |
void SendGestureEvent(const GestureEventWithLatencyInfo& event) override { |
sent_events_.push_back(event.event); |
+ sent_gesture_events_.push_back(event.event); |
} |
void OnMouseWheelEventAck(const MouseWheelEventWithLatencyInfo& event, |
@@ -72,11 +73,16 @@ class MouseWheelEventQueueTest : public testing::Test, |
std::vector<WebInputEvent>& all_sent_events() { return sent_events_; } |
+ std::vector<WebGestureEvent>& sent_gesture_events() { |
+ return sent_gesture_events_; |
+ } |
+ |
const WebMouseWheelEvent& acked_event() const { return last_acked_event_; } |
size_t GetAndResetSentEventCount() { |
size_t count = sent_events_.size(); |
sent_events_.clear(); |
+ sent_gesture_events_.clear(); |
return count; |
} |
@@ -112,6 +118,7 @@ class MouseWheelEventQueueTest : public testing::Test, |
scoped_ptr<MouseWheelEventQueue> queue_; |
std::vector<WebInputEvent> sent_events_; |
+ std::vector<WebGestureEvent> sent_gesture_events_; |
size_t acked_event_count_; |
InputEventAckState last_acked_event_state_; |
base::MessageLoopForUI message_loop_; |
@@ -170,13 +177,19 @@ TEST_F(MouseWheelEventQueueTest, GestureSending) { |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_EQ(3U, all_sent_events().size()); |
EXPECT_EQ(WebInputEvent::GestureScrollBegin, all_sent_events()[0].type); |
+ EXPECT_EQ(WebGestureEvent::Pixels, |
tdresser
2016/02/18 16:00:46
Should we have a test which expects PrecisePixels?
dtapuska
2016/02/18 16:16:44
I knew you would ask.. :-)
|
+ sent_gesture_events()[0].data.scrollBegin.deltaHintUnits); |
EXPECT_EQ(WebInputEvent::GestureScrollUpdate, all_sent_events()[1].type); |
+ EXPECT_EQ(WebGestureEvent::Pixels, |
+ sent_gesture_events()[1].data.scrollUpdate.deltaUnits); |
EXPECT_EQ(WebInputEvent::MouseWheel, all_sent_events()[2].type); |
EXPECT_EQ(3U, GetAndResetSentEventCount()); |
RunTasksAndWait(DefaultScrollEndTimeoutDelay() * 2); |
EXPECT_EQ(1U, all_sent_events().size()); |
EXPECT_EQ(WebInputEvent::GestureScrollEnd, all_sent_events()[0].type); |
+ EXPECT_EQ(WebGestureEvent::Pixels, |
+ sent_gesture_events()[0].data.scrollEnd.deltaUnits); |
} |
TEST_F(MouseWheelEventQueueTest, GestureSendingInterrupted) { |