Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 11 insertions, 2 deletions

diff --git a/Source/WebKit/chromium/src/WebInputEventConversion.cpp b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
index 5cf0ccaec..b4055a91e 100644
--- a/Source/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -155,11 +155,18 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
     case WebInputEvent::GestureDoubleTap:
         m_type = PlatformEvent::GestureDoubleTap;
         break;
+    case WebInputEvent::GestureLongPress:
+        m_type = PlatformEvent::GestureLongPress;
+        break;
     case WebInputEvent::GesturePinchBegin:
+        m_type = PlatformEvent::GesturePinchBegin;
+        break;
     case WebInputEvent::GesturePinchEnd:
+        m_type = PlatformEvent::GesturePinchEnd;
+        break;
     case WebInputEvent::GesturePinchUpdate:
-        // FIXME: Once PlatformGestureEvent is updated to support pinch, this should set m_type to appropriate PlatformEvent type.
-        ASSERT_NOT_REACHED();
+        m_type = PlatformEvent::GesturePinchUpdate;
+        break;
     default:
         ASSERT_NOT_REACHED();
     }
@@ -167,6 +174,8 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_deltaX = e.deltaX;
     m_deltaY = e.deltaY;
+    m_gammaX = e.gammaX;
+    m_gammaY = e.gammaY;
     m_timestamp = e.timeStampSeconds;
 
     m_modifiers = 0;