WebMouseEvent coordinates are now fractional & private

content/browser/renderer_host/input/input_router_impl_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 "content/browser/renderer_host/input/input_router_impl.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 2074 matching lines @@
 
 class InputRouterImplScaleMouseEventTest
     : public InputRouterImplScaleEventTest {
  public:
   InputRouterImplScaleMouseEventTest() {}
 
   void RunMouseEventTest(const std::string& name, WebInputEvent::Type type) {
     SCOPED_TRACE(name);
     SimulateMouseEvent(type, 10, 10);
     const WebMouseEvent* sent_event = GetSentWebInputEvent<WebMouseEvent>();
-    EXPECT_EQ(20, sent_event->x);
-    EXPECT_EQ(20, sent_event->y);
+    EXPECT_EQ(20, sent_event->positionInWidget().x);
+    EXPECT_EQ(20, sent_event->positionInWidget().y);
 
     const WebMouseEvent* filter_event = GetFilterWebInputEvent<WebMouseEvent>();
-    EXPECT_EQ(10, filter_event->x);
-    EXPECT_EQ(10, filter_event->y);
+    EXPECT_EQ(10, filter_event->positionInWidget().x);
+    EXPECT_EQ(10, filter_event->positionInWidget().y);
 
     process_->sink().ClearMessages();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputRouterImplScaleMouseEventTest);
 };
 
 }  // namespace
 
 TEST_F(InputRouterImplScaleMouseEventTest, ScaleMouseEventTest) {
   RunMouseEventTest("Enter", WebInputEvent::MouseEnter);
   RunMouseEventTest("Down", WebInputEvent::MouseDown);
   RunMouseEventTest("Move", WebInputEvent::MouseMove);
   RunMouseEventTest("Up", WebInputEvent::MouseUp);
 }
 
 TEST_F(InputRouterImplScaleEventTest, ScaleMouseWheelEventTest) {
   ASSERT_EQ(0u, process_->sink().message_count());
   SimulateWheelEvent(5, 5, 10, 10, 0, false);
   ASSERT_EQ(1u, process_->sink().message_count());
 
   const WebMouseWheelEvent* sent_event =
       GetSentWebInputEvent<WebMouseWheelEvent>();
-  EXPECT_EQ(10, sent_event->x);
-  EXPECT_EQ(10, sent_event->y);
+  EXPECT_EQ(10, sent_event->positionInWidget().x);
+  EXPECT_EQ(10, sent_event->positionInWidget().y);
   EXPECT_EQ(20, sent_event->deltaX);
   EXPECT_EQ(20, sent_event->deltaY);
   EXPECT_EQ(2, sent_event->wheelTicksX);
   EXPECT_EQ(2, sent_event->wheelTicksY);
 
   const WebMouseWheelEvent* filter_event =
       GetFilterWebInputEvent<WebMouseWheelEvent>();
-  EXPECT_EQ(5, filter_event->x);
-  EXPECT_EQ(5, filter_event->y);
+  EXPECT_EQ(5, filter_event->positionInWidget().x);
+  EXPECT_EQ(5, filter_event->positionInWidget().y);
   EXPECT_EQ(10, filter_event->deltaX);
   EXPECT_EQ(10, filter_event->deltaY);
   EXPECT_EQ(1, filter_event->wheelTicksX);
   EXPECT_EQ(1, filter_event->wheelTicksY);
 
   EXPECT_EQ(sent_event->accelerationRatioX, filter_event->accelerationRatioX);
   EXPECT_EQ(sent_event->accelerationRatioY, filter_event->accelerationRatioY);
 }
 
 namespace {
@@ skipping 326 matching lines @@
   EXPECT_EQ(80, sent_event->data.flingStart.velocityY);
 
   const WebGestureEvent* filter_event =
       GetFilterWebInputEvent<WebGestureEvent>();
   TestLocationInFilterEvent(filter_event, orig);
   EXPECT_EQ(30, filter_event->data.flingStart.velocityX);
   EXPECT_EQ(40, filter_event->data.flingStart.velocityY);
 }
 
 }  // namespace content