Chrome requires WebTouchPoint to store WebFloatPoint, instead of WebPoint.

content/browser/renderer_host/input/synthetic_gesture_controller_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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
@@ skipping 150 matching lines @@
       anchor_.SetPoint(touch_event.touches[0].position.x,
                        touch_event.touches[0].position.y);
       started_ = true;
     } else {
       ASSERT_NE(touch_event.type, WebInputEvent::TouchStart);
       ASSERT_NE(touch_event.type, WebInputEvent::TouchCancel);
       // Ignore move events.
 
       if (touch_event.type == WebInputEvent::TouchEnd)
         scroll_distance_ =
-            anchor_ - gfx::PointF(touch_event.touches[0].position.x,
-                                  touch_event.touches[0].position.y);
+            anchor_ - gfx::PointF(touch_event.touches[0].position);
     }
   }
 
  protected:
   gfx::Point anchor_;
   bool started_;
 };
 
 class MockSyntheticPinchTouchTarget : public MockSyntheticGestureTarget {
  public:
@@ skipping 12 matching lines @@
 
   virtual void DispatchInputEventToPlatform(
       const WebInputEvent& event) OVERRIDE {
     ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type));
     const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event);
     ASSERT_EQ(touch_event.touchesLength, 2U);
 
     if (!started_) {
       ASSERT_EQ(touch_event.type, WebInputEvent::TouchStart);
 
-      start_0_ = gfx::PointF(touch_event.touches[0].position.x,
-                             touch_event.touches[0].position.y);
-      start_1_ = gfx::PointF(touch_event.touches[1].position.x,
-                             touch_event.touches[1].position.y);
+      start_0_ = gfx::PointF(touch_event.touches[0].position);
+      start_1_ = gfx::PointF(touch_event.touches[1].position);
       last_pointer_distance_ = (start_0_ - start_1_).Length();
 
       started_ = true;
     } else {
       ASSERT_NE(touch_event.type, WebInputEvent::TouchStart);
       ASSERT_NE(touch_event.type, WebInputEvent::TouchCancel);
 
-      gfx::PointF current_0 = gfx::PointF(touch_event.touches[0].position.x,
-                                          touch_event.touches[0].position.y);
-      gfx::PointF current_1 = gfx::PointF(touch_event.touches[1].position.x,
-                                          touch_event.touches[1].position.y);
+      gfx::PointF current_0 = gfx::PointF(touch_event.touches[0].position);
+      gfx::PointF current_1 = gfx::PointF(touch_event.touches[1].position);
 
       total_num_pixels_covered_ =
           (current_0 - start_0_).Length() + (current_1 - start_1_).Length();
       float pointer_distance = (current_0 - current_1).Length();
 
       if (last_pointer_distance_ != pointer_distance) {
         if (zoom_direction_ == ZOOM_DIRECTION_UNKNOWN)
           zoom_direction_ =
               ComputeZoomDirection(last_pointer_distance_, pointer_distance);
         else
@@ skipping 34 matching lines @@
   gfx::PointF position() const { return position_; }
   base::TimeDelta GetDuration() const { return stop_time_ - start_time_; }
 
  protected:
   enum GestureState {
     NOT_STARTED,
     STARTED,
     FINISHED
   };
 
-  // TODO(tdresser): clean up accesses to position_ once WebTouchPoint stores
-  // its location as a WebFloatPoint. See crbug.com/336807.
   gfx::PointF position_;
   base::TimeDelta start_time_;
   base::TimeDelta stop_time_;
   GestureState state_;
 };
 
 class MockSyntheticTapTouchTarget : public MockSyntheticTapGestureTarget {
  public:
   MockSyntheticTapTouchTarget() {}
   virtual ~MockSyntheticTapTouchTarget() {}
 
   virtual void DispatchInputEventToPlatform(
         const WebInputEvent& event) OVERRIDE {
     ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type));
     const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event);
     ASSERT_EQ(touch_event.touchesLength, 1U);
 
     switch (state_) {
       case NOT_STARTED:
         EXPECT_EQ(touch_event.type, WebInputEvent::TouchStart);
-        position_ = gfx::PointF(touch_event.touches[0].position.x,
-                                touch_event.touches[0].position.y);
+        position_ = gfx::PointF(touch_event.touches[0].position);
         start_time_ = base::TimeDelta::FromMilliseconds(
             static_cast<int64>(touch_event.timeStampSeconds * 1000));
         state_ = STARTED;
         break;
       case STARTED:
         EXPECT_EQ(touch_event.type, WebInputEvent::TouchEnd);
-        EXPECT_EQ(position_, gfx::PointF(touch_event.touches[0].position.x,
-                                         touch_event.touches[0].position.y));
+        EXPECT_EQ(position_, gfx::PointF(touch_event.touches[0].position));
         stop_time_ = base::TimeDelta::FromMilliseconds(
             static_cast<int64>(touch_event.timeStampSeconds * 1000));
         state_ = FINISHED;
         break;
       case FINISHED:
         EXPECT_FALSE(true);
         break;
     }
   }
 };
 
 class MockSyntheticTapMouseTarget : public MockSyntheticTapGestureTarget {
  public:
   MockSyntheticTapMouseTarget() {}
   virtual ~MockSyntheticTapMouseTarget() {}
 
   virtual void DispatchInputEventToPlatform(
         const WebInputEvent& event) OVERRIDE {
     ASSERT_TRUE(WebInputEvent::isMouseEventType(event.type));
     const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
 
     switch (state_) {
       case NOT_STARTED:
         EXPECT_EQ(mouse_event.type, WebInputEvent::MouseDown);
         EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);
         EXPECT_EQ(mouse_event.clickCount, 1);
-        position_ = gfx::Point(mouse_event.x, mouse_event.y);
+        position_ = gfx::PointF(mouse_event.x, mouse_event.y);
         start_time_ = base::TimeDelta::FromMilliseconds(
             static_cast<int64>(mouse_event.timeStampSeconds * 1000));
         state_ = STARTED;
         break;
       case STARTED:
         EXPECT_EQ(mouse_event.type, WebInputEvent::MouseUp);
         EXPECT_EQ(mouse_event.button, WebMouseEvent::ButtonLeft);
         EXPECT_EQ(mouse_event.clickCount, 1);
-        EXPECT_EQ(position_, gfx::Point(mouse_event.x, mouse_event.y));
+        EXPECT_EQ(position_, gfx::PointF(mouse_event.x, mouse_event.y));
         stop_time_ = base::TimeDelta::FromMilliseconds(
             static_cast<int64>(mouse_event.timeStampSeconds * 1000));
         state_ = FINISHED;
         break;
       case FINISHED:
         EXPECT_FALSE(true);
         break;
     }
   }
 };
@@ skipping 476 matching lines @@
   EXPECT_TRUE(tap_target->GestureFinished());
   EXPECT_EQ(tap_target->position(), params.position);
   EXPECT_EQ(tap_target->GetDuration().InMilliseconds(), params.duration_ms);
   EXPECT_GE(GetTotalTime(),
             base::TimeDelta::FromMilliseconds(params.duration_ms));
 }
 
 }  // namespace
 
 }  // namespace content