Move EventHandler from core/page/ to core/input

Source/web/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 24 matching lines @@
 #include "core/dom/Touch.h"
 #include "core/dom/TouchList.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
+#include "core/input/InputDevice.h"

[tdresser, 2015/06/04 13:08:47]

I don't think these changes belong as part of this patch.

 #include "core/layout/LayoutView.h"
 #include "core/page/Page.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebSettings.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
@@ skipping 63 matching lines @@
     p0.position = WebFloatPoint(10.f, 10.f);
     p1.position = WebFloatPoint(5.f, 5.f);
     p0.radiusX = p1.radiusY = 10.f;
     p0.radiusY = p1.radiusX = 5.f;
     p0.rotationAngle = p1.rotationAngle = 1.f;
     p0.force = p1.force = 25.f;
 
     RefPtrWillBeRawPtr<Touch> touch0 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p0.id, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);
     RefPtrWillBeRawPtr<Touch> touch1 = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), p1.id, p1.screenPosition, p1.position, FloatSize(p1.radiusX, p1.radiusY), p1.rotationAngle, p1.force);
 
+    InputDevice* sourceDeviceFireTouchEvent = InputDevice::touchEventInstance().get();
+
     // Test touchstart.
     {
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch0);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StatePressed, webTouchBuilder.touches[0].state);
         EXPECT_FLOAT_EQ(p0.screenPosition.x, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(p0.screenPosition.y, webTouchBuilder.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(p0.position.x, webTouchBuilder.touches[0].position.x);
         EXPECT_FLOAT_EQ(p0.position.y, webTouchBuilder.touches[0].position.y);
         EXPECT_FLOAT_EQ(p0.radiusX, webTouchBuilder.touches[0].radiusX);
         EXPECT_FLOAT_EQ(p0.radiusY, webTouchBuilder.touches[0].radiusY);
         EXPECT_FLOAT_EQ(p0.rotationAngle, webTouchBuilder.touches[0].rotationAngle);
         EXPECT_FLOAT_EQ(p0.force, webTouchBuilder.touches[0].force);
     }
 
     // Test touchmove.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> movedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         activeTouchList->append(touch1);
         movedTouchList->append(touch0);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[1].state);
         EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
         EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     }
 
     // Test touchmove, different point yields same ordering.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> movedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         activeTouchList->append(touch1);
         movedTouchList->append(touch1);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), movedTouchList.get(), EventTypeNames::touchmove, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[1].state);
         EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
         EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     }
 
     // Test touchend.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> releasedTouchList = TouchList::create();
         activeTouchList->append(touch0);
         releasedTouchList->append(touch1);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), releasedTouchList.get(), EventTypeNames::touchend, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), releasedTouchList.get(), EventTypeNames::touchend, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateReleased, webTouchBuilder.touches[1].state);
         EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
         EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     }
 
     // Test touchcancel.
     {
         RefPtrWillBeRawPtr<TouchList> activeTouchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> cancelledTouchList = TouchList::create();
         cancelledTouchList->append(touch0);
         cancelledTouchList->append(touch1);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), cancelledTouchList.get(), EventTypeNames::touchcancel, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(activeTouchList.get(), activeTouchList.get(), cancelledTouchList.get(), EventTypeNames::touchcancel, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(2u, webTouchBuilder.touchesLength);
         EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type);
         EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[0].state);
         EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[1].state);
         EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
         EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     }
 
     // Test max point limit.
     {
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         RefPtrWillBeRawPtr<TouchList> changedTouchList = TouchList::create();
         for (unsigned i = 0; i <= static_cast<unsigned>(WebTouchEvent::touchesLengthCap) * 2; ++i) {
             RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), i, p0.screenPosition, p0.position, FloatSize(p0.radiusX, p0.radiusY), p0.rotationAngle, p0.force);
             touchList->append(touch);
             changedTouchList->append(touch);
         }
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchstart, domWindow, sourceDeviceFireTouchEvent, false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(static_cast<unsigned>(WebTouchEvent::touchesLengthCap), webTouchBuilder.touchesLength);
     }
 }
 
 TEST(WebInputEventConversionTest, InputEventsScaling)
 {
     const std::string baseURL("http://www.test1.com/");
     const std::string fileName("fixed_layout.html");
@@ skipping 217 matching lines @@
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityX);
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityY);
         EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.inertial);
         EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.preventPropagation);
     }
 
     {
         RefPtrWillBeRawPtr<Touch> touch = Touch::create(toLocalFrame(webViewImpl->page()->mainFrame()), document.get(), 0, FloatPoint(10, 9.5), FloatPoint(3.5, 2), FloatSize(4, 4.5), 0, 0);
         RefPtrWillBeRawPtr<TouchList> touchList = TouchList::create();
         touchList->append(touch);
-        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, false, false, false, false, false, false);
+        RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), EventTypeNames::touchmove, domWindow, InputDevice::touchEventInstance(), false, false, false, false, false, false);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
         ASSERT_EQ(1u, webTouchBuilder.touchesLength);
         EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
         EXPECT_FLOAT_EQ(9.5, webTouchBuilder.touches[0].screenPosition.y);
         EXPECT_FLOAT_EQ(3.5, webTouchBuilder.touches[0].position.x);
         EXPECT_FLOAT_EQ(2, webTouchBuilder.touches[0].position.y);
         EXPECT_FLOAT_EQ(4, webTouchBuilder.touches[0].radiusX);
         EXPECT_FLOAT_EQ(4.5, webTouchBuilder.touches[0].radiusY);
         EXPECT_FALSE(webTouchBuilder.cancelable);
@@ skipping 458 matching lines @@
         EXPECT_EQ(15, platformWheelBuilder.deltaX());
         EXPECT_EQ(10, platformWheelBuilder.deltaY());
         EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_FALSE(platformWheelBuilder.canScroll());
         EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeVertical);
     }
 }
 
 } // anonymous namespace