Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 16 insertions, 4 deletions

diff --git a/Source/WebKit/chromium/public/WebInputEvent.h b/Source/WebKit/chromium/public/WebInputEvent.h
index 6ac9f1f57..b7a5ecbd2 100644
--- a/Source/WebKit/chromium/public/WebInputEvent.h
+++ b/Source/WebKit/chromium/public/WebInputEvent.h
@@ -116,6 +116,7 @@ public:
         GestureTap,
         GestureTapDown,
         GestureDoubleTap,
+        GestureTwoFingerTap,
         GestureLongPress,
         GesturePinchBegin,
         GesturePinchEnd,
@@ -197,16 +198,25 @@ public:
             || type == TouchEnd;
     }
 
-    // Returns true if the WebInputEvent |type| should be handled as scroll gesture.
-    static bool isScrollGestureEventType(int type)
+    // Returns true if the WebInputEvent is a gesture event.
+    static bool isGestureEventType(int type)
     {
         return type == GestureScrollBegin
             || type == GestureScrollEnd
             || type == GestureScrollUpdate
             || type == GestureFlingStart
             || type == GestureFlingCancel
+            || type == GesturePinchBegin
+            || type == GesturePinchEnd
+            || type == GesturePinchUpdate
+            || type == GestureTap
             || type == GestureTapDown
-            || type == GestureTap; // FIXME: Why is GestureTap on this list?
+            || type == GestureDoubleTap
+            || type == GestureTwoFingerTap
+            || type == GestureLongPress
+            || type == GesturePinchBegin
+            || type == GesturePinchEnd
+            || type == GesturePinchUpdate;
     }
 };
 
@@ -379,7 +389,9 @@ public:
 
 class WebTouchEvent : public WebInputEvent {
 public:
-    enum { touchesLengthCap = 8 };
+    // Maximum number of simultaneous touches supported on
+    // Ash/Aura.
+    enum { touchesLengthCap = 12 };
 
     unsigned touchesLength;
     // List of all touches which are currently down.