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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/input/touch_event_queue_unittest.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/input/touch_event_queue.cc ('k') | content/browser/renderer_host/input/touchscreen_tap_suppression_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/touch_event_queue_unittest.cc
diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc
index 6635090907e93a7e18ddf934199777c5da9122f5..7da1fc58670f5a68bff284de588e5ba55691bf2e 100644
--- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc
+++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc
@@ -114,13 +114,13 @@ class TouchEventQueueTest : public testing::Test,
event.movedBeyondSlopRegion = false;
if (WebTouchEventTraits::IsTouchSequenceStart(event))
anchor_ = event.touches[0].position;
- if (event.type == WebInputEvent::TouchMove) {
+ if (event.type() == WebInputEvent::TouchMove) {
gfx::Vector2dF delta = anchor_ - event.touches[0].position;
if (delta.LengthSquared() > slop_length_dips_ * slop_length_dips_)
event.movedBeyondSlopRegion = true;
}
} else {
- event.movedBeyondSlopRegion = event.type == WebInputEvent::TouchMove;
+ event.movedBeyondSlopRegion = event.type() == WebInputEvent::TouchMove;
}
queue_->QueueEvent(TouchEventWithLatencyInfo(event, ui::LatencyInfo()));
}
@@ -197,7 +197,7 @@ class TouchEventQueueTest : public testing::Test,
touch_event_.touches[index].state = WebTouchPoint::StateMoved;
touch_event_.movedBeyondSlopRegion = true;
WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
- touch_event_.timeStampSeconds,
+ touch_event_.timeStampSeconds(),
&touch_event_);
SendTouchEvent();
}
@@ -210,7 +210,7 @@ class TouchEventQueueTest : public testing::Test,
touch_event_.touches[index].state = WebTouchPoint::StateMoved;
touch_event_.movedBeyondSlopRegion = true;
WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
- touch_event_.timeStampSeconds,
+ touch_event_.timeStampSeconds(),
&touch_event_);
SendTouchEvent();
}
@@ -223,7 +223,7 @@ class TouchEventQueueTest : public testing::Test,
touch_event_.touches[index].state = WebTouchPoint::StateMoved;
touch_event_.movedBeyondSlopRegion = true;
WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
- touch_event_.timeStampSeconds,
+ touch_event_.timeStampSeconds(),
&touch_event_);
SendTouchEvent();
}
@@ -243,7 +243,7 @@ class TouchEventQueueTest : public testing::Test,
}
void AdvanceTouchTime(double seconds) {
- touch_event_.setTimeStampSeconds(touch_event_.timeStampSeconds + seconds);
+ touch_event_.setTimeStampSeconds(touch_event_.timeStampSeconds() + seconds);
}
void ResetTouchEvent() {
@@ -362,7 +362,7 @@ TEST_F(TouchEventQueueTest, Basic) {
EXPECT_EQ(1U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(WebInputEvent::Blocking, acked_event().dispatchType);
// Receive an ACK for the second touch-event.
@@ -370,7 +370,7 @@ TEST_F(TouchEventQueueTest, Basic) {
EXPECT_EQ(0U, queued_event_count());
EXPECT_EQ(0U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
EXPECT_EQ(WebInputEvent::Blocking, acked_event().dispatchType);
}
@@ -612,7 +612,7 @@ TEST_F(TouchEventQueueTest, Coalesce) {
EXPECT_EQ(2U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, acked_event_state());
// ACK the moves.
@@ -620,14 +620,14 @@ TEST_F(TouchEventQueueTest, Coalesce) {
EXPECT_EQ(1U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(10U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
// ACK the release.
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(0U, queued_event_count());
EXPECT_EQ(0U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type());
}
// Tests that an event that has already been sent but hasn't been ack'ed yet
@@ -730,14 +730,14 @@ TEST_F(TouchEventQueueTest, NoConsumer) {
// touch-event, but it should not be sent to the renderer.
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
EXPECT_EQ(2U, GetAndResetAckedEventCount());
EXPECT_EQ(0U, GetAndResetSentEventCount());
// Send a release event. This should not reach the renderer.
ReleaseTouchPoint(0);
EXPECT_EQ(0U, GetAndResetSentEventCount());
- EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
// Send a press-event, followed by move and release events, and another press
@@ -759,14 +759,14 @@ TEST_F(TouchEventQueueTest, NoConsumer) {
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
EXPECT_EQ(1U, GetAndResetSentEventCount());
- EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type());
EXPECT_EQ(4U, GetAndResetAckedEventCount());
EXPECT_EQ(1U, queued_event_count());
// ACK the second press event as NO_CONSUMER too.
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
EXPECT_EQ(0U, GetAndResetSentEventCount());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
EXPECT_EQ(0U, queued_event_count());
@@ -776,7 +776,7 @@ TEST_F(TouchEventQueueTest, NoConsumer) {
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, queued_event_count());
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
}
@@ -858,7 +858,7 @@ TEST_F(TouchEventQueueTest, AckWithFollowupEvents) {
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, acked_event_state());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
// Queue another event.
MoveTouchPoint(0, 2, 2);
@@ -937,7 +937,7 @@ TEST_F(TouchEventQueueTest, ImmediateAckWithFollowupEvents) {
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, acked_event_state());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
}
// Tests basic TouchEvent forwarding suppression.
@@ -1082,7 +1082,7 @@ TEST_F(TouchEventQueueTest, TouchTimeoutBasic) {
// Ack'ing the original event should trigger a cancel event.
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_FALSE(IsTimeoutRunning());
- EXPECT_EQ(WebInputEvent::TouchCancel, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchCancel, sent_event().type());
EXPECT_NE(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_EQ(0U, GetAndResetAckedEventCount());
EXPECT_EQ(1U, GetAndResetSentEventCount());
@@ -1104,7 +1104,7 @@ TEST_F(TouchEventQueueTest, TouchTimeoutBasic) {
// Subsequent events should be handled normally.
PressTouchPoint(0, 1);
- EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type());
EXPECT_EQ(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -1684,9 +1684,9 @@ TEST_F(TouchEventQueueTest, AsyncTouchThrottledAfterScroll) {
SetFollowupEvent(followup_scroll);
EXPECT_FALSE(HasPendingAsyncTouchMove());
EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type);
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[0].dispatchType);
- EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[1].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[1].dispatchType);
EXPECT_EQ(2U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -1763,9 +1763,9 @@ TEST_F(TouchEventQueueTest, AsyncTouchThrottledAfterScroll) {
PressTouchPoint(30, 30);
EXPECT_FALSE(HasPendingAsyncTouchMove());
EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type);
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[0].dispatchType);
- EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[1].type());
EXPECT_EQ(WebInputEvent::Blocking, all_sent_events()[1].dispatchType);
EXPECT_EQ(2U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -1794,7 +1794,7 @@ TEST_F(TouchEventQueueTest, AsyncTouchThrottledAfterScroll) {
MoveTouchPoint(0, 0, 26);
EXPECT_EQ(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_FALSE(HasPendingAsyncTouchMove());
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_EQ(WebTouchPoint::StateMoved, sent_event().touches[0].state);
EXPECT_EQ(WebTouchPoint::StateMoved, sent_event().touches[1].state);
EXPECT_EQ(1U, queued_event_count());
@@ -1809,14 +1809,14 @@ TEST_F(TouchEventQueueTest, AsyncTouchThrottledAfterScroll) {
EXPECT_EQ(3U, queued_event_count());
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(WebInputEvent::Blocking, sent_event().dispatchType);
- EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type());
EXPECT_EQ(2U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(WebInputEvent::Blocking, sent_event().dispatchType);
- EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type());
EXPECT_EQ(1U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
@@ -1871,11 +1871,11 @@ TEST_F(TouchEventQueueTest, AsyncTouchFlushedByTouchEnd) {
ReleaseTouchPoint(0);
EXPECT_FALSE(HasPendingAsyncTouchMove());
EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type);
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[0].dispatchType);
EXPECT_EQ(0, all_sent_events()[0].touches[0].position.x);
EXPECT_EQ(0, all_sent_events()[0].touches[0].position.y);
- EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[1].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[1].dispatchType);
EXPECT_EQ(2U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -1996,20 +1996,20 @@ TEST_F(TouchEventQueueTest, AsyncTouchWithTouchCancelAfterAck) {
MoveTouchPoint(0, 5, 5);
EXPECT_EQ(1U, queued_event_count());
EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type);
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[0].dispatchType);
- EXPECT_EQ(WebInputEvent::TouchCancel, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchCancel, all_sent_events()[1].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[1].dispatchType);
EXPECT_EQ(2U, GetAndResetSentEventCount());
// Sending the ack is because the async touchmove is not ready for
// dispatching send the ack immediately.
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchCancel, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchCancel, acked_event().type());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
EXPECT_EQ(0U, GetAndResetSentEventCount());
}
@@ -2039,7 +2039,7 @@ TEST_F(TouchEventQueueTest, AsyncTouchWithHardTouchStartReset) {
EXPECT_EQ(0U, GetAndResetSentEventCount());
EXPECT_EQ(1U, GetAndResetAckedEventCount());
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
// The queue should be robust to hard touch restarts with a new touch
// sequence. In this case, the deferred async touch should not be flushed
@@ -2048,7 +2048,7 @@ TEST_F(TouchEventQueueTest, AsyncTouchWithHardTouchStartReset) {
ResetTouchEvent();
PressTouchPoint(0, 0);
- EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type());
EXPECT_EQ(1U, GetAndResetSentEventCount());
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
EXPECT_EQ(1U, GetAndResetAckedEventCount());
@@ -2170,7 +2170,7 @@ TEST_F(TouchEventQueueTest, SendNextAsyncTouchMoveAfterAckAndTimeExpire) {
AdvanceTouchTime(kMinSecondsBetweenThrottledTouchmoves + 0.1);
MoveTouchPoint(0, 0, 50);
EXPECT_FALSE(HasPendingAsyncTouchMove());
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_NE(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_EQ(0U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
@@ -2232,13 +2232,13 @@ TEST_F(TouchEventQueueTest, AsyncTouchFlushedByNonTouchMove) {
PressTouchPoint(30, 30);
EXPECT_FALSE(HasPendingAsyncTouchMove());
EXPECT_EQ(2U, all_sent_events().size());
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type);
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[0].type());
EXPECT_NE(WebInputEvent::Blocking, all_sent_events()[0].dispatchType);
EXPECT_EQ(10 + 10 * i, all_sent_events()[0].touches[0].position.x);
EXPECT_EQ(10 + 10 * i, all_sent_events()[0].touches[0].position.y);
EXPECT_EQ(static_cast<size_t>(i + 2),
uncancelable_touch_moves_pending_ack_count());
- EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[1].type());
EXPECT_EQ(WebInputEvent::Blocking, all_sent_events()[1].dispatchType);
EXPECT_EQ(2U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -2284,7 +2284,7 @@ TEST_F(TouchEventQueueTest, AsyncTouchFlushedByNonTouchMove) {
EXPECT_EQ(1U, uncancelable_touch_moves_pending_ack_count());
EXPECT_FALSE(HasPendingAsyncTouchMove());
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_NE(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_EQ(1U, GetAndResetSentEventCount());
EXPECT_EQ(0U, GetAndResetAckedEventCount());
@@ -2347,7 +2347,7 @@ TEST_F(TouchEventQueueTest, DoNotIncreaseIfClientConsumeAsyncTouchMove) {
SetSyncAckResult(INPUT_EVENT_ACK_STATE_CONSUMED);
MoveTouchPoint(0, 0, 50);
EXPECT_FALSE(HasPendingAsyncTouchMove());
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_NE(WebInputEvent::Blocking, sent_event().dispatchType);
EXPECT_EQ(0U, queued_event_count());
EXPECT_EQ(1U, GetAndResetSentEventCount());
@@ -2508,7 +2508,7 @@ TEST_F(TouchEventQueueTest, PointerStatesInTouchMove) {
// Test current touches state before sending TouchMoves.
const WebTouchEvent& event1 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchStart, event1.type);
+ EXPECT_EQ(WebInputEvent::TouchStart, event1.type());
EXPECT_EQ(WebTouchPoint::StateStationary, event1.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event1.touches[1].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event1.touches[2].state);
@@ -2525,7 +2525,7 @@ TEST_F(TouchEventQueueTest, PointerStatesInTouchMove) {
// 1st TouchMove is sent. Test for touches state.
const WebTouchEvent& event2 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event2.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event2.type());
EXPECT_EQ(WebTouchPoint::StateMoved, event2.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateMoved, event2.touches[1].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event2.touches[2].state);
@@ -2540,7 +2540,7 @@ TEST_F(TouchEventQueueTest, PointerStatesInTouchMove) {
// 2nd TouchMove is sent. Test for touches state.
const WebTouchEvent& event3 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event3.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event3.type());
EXPECT_EQ(WebTouchPoint::StateStationary, event3.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event3.touches[1].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event3.touches[2].state);
@@ -2563,7 +2563,7 @@ TEST_F(TouchEventQueueTest, PointerStatesWhenOtherThanPositionChanged) {
// TouchMove is sent. Test for pointer state.
const WebTouchEvent& event1 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event1.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event1.type());
EXPECT_EQ(WebTouchPoint::StateMoved, event1.touches[0].state);
// Change touch point force.
@@ -2572,7 +2572,7 @@ TEST_F(TouchEventQueueTest, PointerStatesWhenOtherThanPositionChanged) {
// TouchMove is sent. Test for pointer state.
const WebTouchEvent& event2 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event2.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event2.type());
EXPECT_EQ(WebTouchPoint::StateMoved, event2.touches[0].state);
// Change touch point rotationAngle.
@@ -2581,7 +2581,7 @@ TEST_F(TouchEventQueueTest, PointerStatesWhenOtherThanPositionChanged) {
// TouchMove is sent. Test for pointer state.
const WebTouchEvent& event3 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event3.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event3.type());
EXPECT_EQ(WebTouchPoint::StateMoved, event3.touches[0].state);
EXPECT_EQ(0U, queued_event_count());
@@ -2605,7 +2605,7 @@ TEST_F(TouchEventQueueTest, FilterTouchMovesWhenNoPointerChanged) {
// TouchMove should be allowed and test for touches state.
const WebTouchEvent& event1 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event1.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event1.type());
EXPECT_EQ(WebTouchPoint::StateMoved, event1.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateStationary, event1.touches[1].state);
EXPECT_EQ(1U, GetAndResetSentEventCount());
@@ -2635,7 +2635,7 @@ TEST_F(TouchEventQueueTest, FilterTouchMovesWhenNoPointerChanged) {
// TouchMove should be allowed and test for touches state.
const WebTouchEvent& event2 = sent_event();
- EXPECT_EQ(WebInputEvent::TouchMove, event2.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, event2.type());
EXPECT_EQ(WebTouchPoint::StateStationary, event2.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateMoved, event2.touches[1].state);
EXPECT_EQ(1U, GetAndResetSentEventCount());
@@ -2669,7 +2669,7 @@ TEST_F(TouchEventQueueTest, TouchScrollNotificationOrder_EndOfQueue) {
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(1U, queued_event_count());
// Receive an ACK for the touch-scroll-notification.
@@ -2678,8 +2678,8 @@ TEST_F(TouchEventQueueTest, TouchScrollNotificationOrder_EndOfQueue) {
EXPECT_EQ(0U, GetAndResetAckedEventCount());
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[0].type);
- EXPECT_EQ(WebInputEvent::TouchScrollStarted, all_sent_events()[1].type);
+ EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[0].type());
+ EXPECT_EQ(WebInputEvent::TouchScrollStarted, all_sent_events()[1].type());
EXPECT_EQ(2U, GetAndResetSentEventCount());
}
@@ -2703,7 +2703,7 @@ TEST_F(TouchEventQueueTest, TouchScrollNotificationOrder_SecondPosition) {
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, acked_event().type());
EXPECT_EQ(3U, queued_event_count());
// Receive an ACK for the touch-scroll-notification.
@@ -2716,20 +2716,20 @@ TEST_F(TouchEventQueueTest, TouchScrollNotificationOrder_SecondPosition) {
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, acked_event().type());
EXPECT_EQ(1U, queued_event_count());
// Receive an ACK for the touchend.
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
EXPECT_EQ(1U, GetAndResetAckedEventCount());
- EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, acked_event().type());
EXPECT_EQ(0U, queued_event_count());
- EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[0].type);
- EXPECT_EQ(WebInputEvent::TouchScrollStarted, all_sent_events()[1].type);
- EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[2].type);
- EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[3].type);
+ EXPECT_EQ(WebInputEvent::TouchStart, all_sent_events()[0].type());
+ EXPECT_EQ(WebInputEvent::TouchScrollStarted, all_sent_events()[1].type());
+ EXPECT_EQ(WebInputEvent::TouchMove, all_sent_events()[2].type());
+ EXPECT_EQ(WebInputEvent::TouchEnd, all_sent_events()[3].type());
EXPECT_EQ(4U, GetAndResetSentEventCount());
}
@@ -2738,22 +2738,22 @@ TEST_F(TouchEventQueueTest, TouchScrollNotificationOrder_SecondPosition) {
TEST_F(TouchEventQueueTest, TouchStartOrFirstTouchMove) {
PressTouchPoint(1, 1);
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchStart, sent_event().type());
EXPECT_TRUE(sent_event().touchStartOrFirstTouchMove);
MoveTouchPoint(0, 5, 5);
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_TRUE(sent_event().touchStartOrFirstTouchMove);
MoveTouchPoint(0, 15, 15);
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchMove, sent_event().type());
EXPECT_FALSE(sent_event().touchStartOrFirstTouchMove);
ReleaseTouchPoint(0);
SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
- EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, sent_event().type());
EXPECT_FALSE(sent_event().touchStartOrFirstTouchMove);
}
« no previous file with comments | « content/browser/renderer_host/input/touch_event_queue.cc ('k') | content/browser/renderer_host/input/touchscreen_tap_suppression_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698