Use new WebTouchPoint field names.

content/browser/renderer_host/input/touch_event_queue_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 166 matching lines @@
                        float y1) {
     touch_event_.MovePoint(index0, x0, y0);
     touch_event_.MovePoint(index1, x1, y1);
     SendTouchEvent();
   }
 
   void ChangeTouchPointRadius(int index, float radius_x, float radius_y) {
     CHECK_GE(index, 0);
     CHECK_LT(index, touch_event_.touchesLengthCap);
     WebTouchPoint& point = touch_event_.touches[index];
-    point.radiusX = radius_x;
-    point.radiusY = radius_y;
+    point.width = radius_x;
+    point.height = radius_y;
     touch_event_.touches[index].state = WebTouchPoint::StateMoved;
     touch_event_.causesScrollingIfUncanceled = true;
     WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
                                    touch_event_.timeStampSeconds,
                                    &touch_event_);
     SendTouchEvent();
   }
 
   void ChangeTouchPointRotationAngle(int index, float rotation_angle) {
     CHECK_GE(index, 0);
     CHECK_LT(index, touch_event_.touchesLengthCap);
     WebTouchPoint& point = touch_event_.touches[index];
     point.rotationAngle = rotation_angle;
     touch_event_.touches[index].state = WebTouchPoint::StateMoved;
     touch_event_.causesScrollingIfUncanceled = true;
     WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
                                    touch_event_.timeStampSeconds,
                                    &touch_event_);
     SendTouchEvent();
   }
 
   void ChangeTouchPointForce(int index, float force) {
     CHECK_GE(index, 0);
     CHECK_LT(index, touch_event_.touchesLengthCap);
     WebTouchPoint& point = touch_event_.touches[index];
-    point.force = force;
+    point.pressure = force;
     touch_event_.touches[index].state = WebTouchPoint::StateMoved;
     touch_event_.causesScrollingIfUncanceled = true;
     WebTouchEventTraits::ResetType(WebInputEvent::TouchMove,
                                    touch_event_.timeStampSeconds,
                                    &touch_event_);
     SendTouchEvent();
   }
 
   void ReleaseTouchPoint(int index) {
     touch_event_.ReleasePoint(index);
@@ skipping 602 matching lines @@
   PressTouchPoint(1, 1);
   EXPECT_EQ(1U, queued_event_count());
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   EXPECT_EQ(0U, GetAndResetAckedEventCount());
 
   // Create a touch event that will be queued synchronously by a touch ack.
   // Note, this will be triggered by all subsequent touch acks.
   WebTouchEvent followup_event;
   followup_event.type = WebInputEvent::TouchMove;
   followup_event.touchesLength = 1;
-  followup_event.touches[0].id = 0;
+  followup_event.touches[0].pointerId = 0;
   followup_event.touches[0].state = WebTouchPoint::StateMoved;
   SetFollowupEvent(followup_event);
 
   // Receive an ACK for the press. This should cause the followup touch-move to
   // be sent to the renderer.
   SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(1U, queued_event_count());
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, acked_event_state());
@@ skipping 48 matching lines @@
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 }
 
 // Tests that followup events triggered by an immediate ack from
 // TouchEventQueue::QueueEvent() are properly handled.
 TEST_F(TouchEventQueueTest, ImmediateAckWithFollowupEvents) {
   // Create a touch event that will be queued synchronously by a touch ack.
   WebTouchEvent followup_event;
   followup_event.type = WebInputEvent::TouchStart;
   followup_event.touchesLength = 1;
-  followup_event.touches[0].id = 1;
+  followup_event.touches[0].pointerId = 1;
   followup_event.touches[0].state = WebTouchPoint::StatePressed;
   SetFollowupEvent(followup_event);
 
   // Now, enqueue a stationary touch that will not be forwarded.  This should be
   // immediately ack'ed with "NO_CONSUMER_EXISTS".  The followup event should
   // then be enqueued and immediately sent to the renderer.
   WebTouchEvent stationary_event;
   stationary_event.touchesLength = 1;
   stationary_event.type = WebInputEvent::TouchMove;
-  stationary_event.touches[0].id = 1;
+  stationary_event.touches[0].pointerId = 1;
   stationary_event.touches[0].state = WebTouchPoint::StateStationary;
   SendTouchEvent(stationary_event);
 
   EXPECT_EQ(1U, queued_event_count());
   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);
 }
 
@@ skipping 1498 matching lines @@
 
 TEST_F(TouchEventQueueTest, UnseenTouchPointerIdsNotForwarded) {
   SyntheticWebTouchEvent event;
   event.PressPoint(0, 0);
   SendTouchEvent(event);
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Give the touchmove a previously unseen pointer id; it should not be sent.
-  int press_id = event.touches[0].id;
+  int press_id = event.touches[0].pointerId;
   event.MovePoint(0, 1, 1);
-  event.touches[0].id = 7;
+  event.touches[0].pointerId = 7;
   SendTouchEvent(event);
   EXPECT_EQ(0U, GetAndResetSentEventCount());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Give the touchmove a valid id; it should be sent.
-  event.touches[0].id = press_id;
+  event.touches[0].pointerId = press_id;
   SendTouchEvent(event);
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Do the same for release.
   event.ReleasePoint(0);
-  event.touches[0].id = 11;
+  event.touches[0].pointerId = 11;
   SendTouchEvent(event);
   EXPECT_EQ(0U, GetAndResetSentEventCount());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Give the touchmove a valid id; it should be sent.
-  event.touches[0].id = press_id;
+  event.touches[0].pointerId = press_id;
   SendTouchEvent(event);
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventAck(INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 }
 
 // Tests that touch points states are correct in TouchMove events.
 TEST_F(TouchEventQueueTest, PointerStatesInTouchMove) {
   PressTouchPoint(1, 1);
   PressTouchPoint(2, 2);
@@ skipping 138 matching lines @@
   // TouchMove should be allowed and test for touches state.
   const WebTouchEvent& event2 = sent_event();
   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());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 }
 
 }  // namespace content