Modify gesture event types for WebView-tag scroll bubbling.

Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 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 179 matching lines @@
     m_wheelTicksY = e.wheelTicksY;
     m_granularity = e.scrollByPage ?
         ScrollByPageWheelEvent : ScrollByPixelWheelEvent;
 
     m_type = PlatformEvent::Wheel;
 
     m_modifiers = toPlatformMouseEventModifiers(e.modifiers);
 
     m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;
     m_canScroll = e.canScroll;
+    m_resendingPluginId = e.resendingPluginId;
     m_railsMode = static_cast<PlatformEvent::RailsMode>(e.railsMode);
 #if OS(MACOSX)
     m_phase = static_cast<PlatformWheelEventPhase>(e.phase);
     m_momentumPhase = static_cast<PlatformWheelEventPhase>(e.momentumPhase);
     m_timestamp = e.timeStampSeconds;
     m_canRubberbandLeft = e.canRubberbandLeft;
     m_canRubberbandRight = e.canRubberbandRight;
 #endif
 }
 
 // PlatformGestureEventBuilder --------------------------------------------------
 
 PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const WebGestureEvent& e)
 {
     switch (e.type) {
     case WebInputEvent::GestureScrollBegin:
         m_type = PlatformEvent::GestureScrollBegin;
+        m_data.m_scroll.m_resendingPluginId = e.resendingPluginId;
         break;
     case WebInputEvent::GestureScrollEnd:
         m_type = PlatformEvent::GestureScrollEnd;
+        m_data.m_scroll.m_resendingPluginId = e.resendingPluginId;
         break;
     case WebInputEvent::GestureFlingStart:
         m_type = PlatformEvent::GestureFlingStart;
+        m_data.m_scroll.m_velocityX = e.data.flingStart.velocityX;
+        m_data.m_scroll.m_velocityY = e.data.flingStart.velocityY;
         break;
     case WebInputEvent::GestureScrollUpdate:
         m_type = PlatformEvent::GestureScrollUpdate;
+        m_data.m_scroll.m_resendingPluginId = e.resendingPluginId;
         m_data.m_scroll.m_deltaX = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaX);
         m_data.m_scroll.m_deltaY = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaY);
         m_data.m_scroll.m_velocityX = e.data.scrollUpdate.velocityX;
         m_data.m_scroll.m_velocityY = e.data.scrollUpdate.velocityY;
         m_data.m_scroll.m_preventPropagation = e.data.scrollUpdate.preventPropagation;
         m_data.m_scroll.m_inertial = e.data.scrollUpdate.inertial;
         break;
     case WebInputEvent::GestureTap:
         m_type = PlatformEvent::GestureTap;
         m_area = expandedIntSize(scaleSizeToWindow(widget, FloatSize(e.data.tap.width, e.data.tap.height)));
@@ skipping 363 matching lines @@
     if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames::mousewheel)
         return;
     type = WebInputEvent::MouseWheel;
     updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
     deltaX = -event.deltaX();
     deltaY = -event.deltaY();
     wheelTicksX = event.ticksX();
     wheelTicksY = event.ticksY();
     scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE;
     canScroll = event.canScroll();
+    resendingPluginId = event.resendingPluginId();
     railsMode = static_cast<RailsMode>(event.railsMode());
 }
 
 WebKeyboardEventBuilder::WebKeyboardEventBuilder(const KeyboardEvent& event)
 {
     if (event.type() == EventTypeNames::keydown)
         type = KeyDown;
     else if (event.type() == EventTypeNames::keyup)
         type = WebInputEvent::KeyUp;
     else if (event.type() == EventTypeNames::keypress)
@@ skipping 111 matching lines @@
         touches[i] = toWebTouchPoint(event.touches()->item(i), layoutObject, WebTouchPoint::StateStationary);
         ++touchesLength;
     }
     // If any existing points are also in the change list, we should update
     // their state, otherwise just add the new points.
     addTouchPointsUpdateStateIfNecessary(toWebTouchPointState(event.type()), event.changedTouches(), touches, &touchesLength, layoutObject);
 }
 
 WebGestureEventBuilder::WebGestureEventBuilder(const LayoutObject* layoutObject, const GestureEvent& event)
 {
-    if (event.type() == EventTypeNames::gestureshowpress)
+    if (event.type() == EventTypeNames::gestureshowpress) {
         type = GestureShowPress;
-    else if (event.type() == EventTypeNames::gesturelongpress)
+    } else if (event.type() == EventTypeNames::gesturelongpress) {
         type = GestureLongPress;
-    else if (event.type() == EventTypeNames::gesturetapdown)
+    } else if (event.type() == EventTypeNames::gesturetapdown) {
         type = GestureTapDown;
-    else if (event.type() == EventTypeNames::gesturescrollstart)
+    } else if (event.type() == EventTypeNames::gesturescrollstart) {
         type = GestureScrollBegin;
-    else if (event.type() == EventTypeNames::gesturescrollend)
+        resendingPluginId = event.resendingPluginId();
+    } else if (event.type() == EventTypeNames::gesturescrollend) {
         type = GestureScrollEnd;
-    else if (event.type() == EventTypeNames::gesturescrollupdate) {
+        resendingPluginId = event.resendingPluginId();
+    } else if (event.type() == EventTypeNames::gesturescrollupdate) {
         type = GestureScrollUpdate;
         data.scrollUpdate.deltaX = event.deltaX();
         data.scrollUpdate.deltaY = event.deltaY();
+        data.scrollUpdate.inertial = event.inertial();
+        resendingPluginId = event.resendingPluginId();
+    } else if (event.type() == EventTypeNames::gestureflingstart) {
+        type = GestureFlingStart;
+        data.flingStart.velocityX = event.velocityX();
+        data.flingStart.velocityY = event.velocityY();
     } else if (event.type() == EventTypeNames::gesturetap) {
         type = GestureTap;
         data.tap.tapCount = 1;
     }
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink