Merge 143032

Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 200 matching lines @@
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].pos().y());
         EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].radiusX());
         EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].radiusY());
     }
 
+    // Reverse builders should *not* go back to physical pixels, as they are used for plugins
+    // which expect CSS pixel coordinates.
     {
         PlatformMouseEvent platformMouseEvent(IntPoint(10, 10), IntPoint(10, 10), LeftButton, PlatformEvent::MouseMoved, 1, false, false, false, false, 0);
         RefPtr<MouseEvent> mouseEvent = MouseEvent::create(WebCore::eventNames().mousemoveEvent, domWindow, platformMouseEvent, 0, document);
         WebMouseEventBuilder webMouseBuilder(view, docRenderer, *mouseEvent);
 
-        EXPECT_EQ(20, webMouseBuilder.x);
-        EXPECT_EQ(20, webMouseBuilder.y);
+        EXPECT_EQ(10, webMouseBuilder.x);
+        EXPECT_EQ(10, webMouseBuilder.y);
         EXPECT_EQ(10, webMouseBuilder.globalX);
         EXPECT_EQ(10, webMouseBuilder.globalY);
-        EXPECT_EQ(20, webMouseBuilder.windowX);
-        EXPECT_EQ(20, webMouseBuilder.windowY);
+        EXPECT_EQ(10, webMouseBuilder.windowX);
+        EXPECT_EQ(10, webMouseBuilder.windowY);
     }
 
     {
         PlatformGestureEvent platformGestureEvent(PlatformEvent::GestureScrollUpdate, IntPoint(10, 10), IntPoint(10, 10), 0, IntSize(10, 10), FloatPoint(10, 10), false, false, false, false);
         RefPtr<GestureEvent> gestureEvent = GestureEvent::create(domWindow, platformGestureEvent);
         WebGestureEventBuilder webGestureBuilder(view, docRenderer, *gestureEvent);
 
-        EXPECT_EQ(20, webGestureBuilder.x);
-        EXPECT_EQ(20, webGestureBuilder.y);
+        EXPECT_EQ(10, webGestureBuilder.x);
+        EXPECT_EQ(10, webGestureBuilder.y);
         EXPECT_EQ(10, webGestureBuilder.globalX);
         EXPECT_EQ(10, webGestureBuilder.globalY);
-        EXPECT_EQ(20, webGestureBuilder.data.scrollUpdate.deltaX);
-        EXPECT_EQ(20, webGestureBuilder.data.scrollUpdate.deltaY);
+        EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaX);
+        EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaY);
     }
 
     {
         RefPtr<Touch> touch = Touch::create(webViewImpl->page()->mainFrame(), document.get(), 0, 10, 10, 10, 10, 10, 10, 0, 0);
         RefPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch);
         RefPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), WebCore::eventNames().touchmoveEvent, domWindow, 10, 10, 10, 10, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(view, docRenderer, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.y);
-        EXPECT_EQ(20, webTouchBuilder.touches[0].position.x);
-        EXPECT_EQ(20, webTouchBuilder.touches[0].position.y);
-        EXPECT_EQ(20, webTouchBuilder.touches[0].radiusX);
-        EXPECT_EQ(20, webTouchBuilder.touches[0].radiusY);
+        EXPECT_EQ(10, webTouchBuilder.touches[0].position.x);
+        EXPECT_EQ(10, webTouchBuilder.touches[0].position.y);
+        EXPECT_EQ(10, webTouchBuilder.touches[0].radiusX);
+        EXPECT_EQ(10, webTouchBuilder.touches[0].radiusY);
     }
 
     webViewImpl->close();
 }
 
 } // anonymous namespace