Modify gesture event types for WebView-tag scroll bubbling.

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 416 matching lines @@
     {
         PlatformMouseEvent platformMouseEvent(IntPoint(10, 10), IntPoint(10, 10), NoButton, PlatformEvent::MouseMoved, 1, false, false, false, false, PlatformMouseEvent::RealOrIndistinguishable, 0);
         RefPtrWillBeRawPtr<MouseEvent> mouseEvent = MouseEvent::create(EventTypeNames::mousemove, domWindow, platformMouseEvent, 0, document);
         WebMouseEventBuilder webMouseBuilder(view, documentLayoutView, *mouseEvent);
         EXPECT_EQ(WebMouseEvent::ButtonNone, webMouseBuilder.button);
     }
 
     {
         PlatformGestureEvent platformGestureEvent(PlatformEvent::GestureScrollUpdate, IntPoint(10, 12), IntPoint(20, 22), IntSize(25, 27), 0,
             false, false, false, false);
-        platformGestureEvent.setScrollGestureData(30, 32, 40, 42, true, true);
+        platformGestureEvent.setScrollGestureData(30, 32, 40, 42, true, 0, true);

[tdresser, 2015/09/15 13:13:08]

-1

[wjmaclean, 2015/09/15 15:02:48]

Done.

         // FIXME: GestureEvent does not preserve velocityX, velocityY,
-        // preventPropagation, or inertial. It also fails to scale
+        // or preventPropagation. It also fails to scale
         // coordinates (x, y, deltaX, deltaY) to the page scale. This
         // may lead to unexpected bugs if a PlatformGestureEvent is
         // transformed into WebGestureEvent and back.
         RefPtrWillBeRawPtr<GestureEvent> gestureEvent = GestureEvent::create(domWindow, platformGestureEvent);
         WebGestureEventBuilder webGestureBuilder(documentLayoutView, *gestureEvent);
 
         EXPECT_EQ(10, webGestureBuilder.x);
         EXPECT_EQ(12, webGestureBuilder.y);
         EXPECT_EQ(20, webGestureBuilder.globalX);
         EXPECT_EQ(22, webGestureBuilder.globalY);
         EXPECT_EQ(30, webGestureBuilder.data.scrollUpdate.deltaX);
         EXPECT_EQ(32, webGestureBuilder.data.scrollUpdate.deltaY);
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityX);
         EXPECT_EQ(0, webGestureBuilder.data.scrollUpdate.velocityY);
-        EXPECT_FALSE(webGestureBuilder.data.scrollUpdate.inertial);
+        EXPECT_TRUE(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);
 
         WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
@@ skipping 402 matching lines @@
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
     RefPtrWillBeRawPtr<WheelEvent> event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
         WheelEvent::DOM_DELTA_PAGE, document.get()->domWindow(),  IntPoint(2, 6), IntPoint(10, 30),
-        true, false, false, false, 0, true, true, Event::RailsModeHorizontal);
+        true, false, false, false, 0, true, 0, true, Event::RailsModeHorizontal);

[tdresser, 2015/09/15 13:13:08]

-1

[wjmaclean, 2015/09/15 15:02:48]

Done.

     WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document.get()->layoutView(), *event);
     EXPECT_EQ(1, webMouseWheel.wheelTicksX);
     EXPECT_EQ(3, webMouseWheel.wheelTicksY);
     EXPECT_EQ(5, webMouseWheel.deltaX);
     EXPECT_EQ(10, webMouseWheel.deltaY);
     EXPECT_EQ(2, webMouseWheel.globalX);
     EXPECT_EQ(6, webMouseWheel.globalY);
     EXPECT_EQ(10, webMouseWheel.windowX);
     EXPECT_EQ(30, webMouseWheel.windowY);
     EXPECT_TRUE(webMouseWheel.scrollByPage);
@@ skipping 81 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);
     }
 }
 
 } // namespace blink