Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 43 insertions, 1 deletions

diff --git a/WebKit/chromium/public/WebInputEvent.h b/WebKit/chromium/public/WebInputEvent.h
index 983aa2a..2ac7475 100644
--- a/WebKit/chromium/public/WebInputEvent.h
+++ b/WebKit/chromium/public/WebInputEvent.h
@@ -32,6 +32,7 @@
 #define WebInputEvent_h
 
 #include "WebCommon.h"
+#include "WebTouchPoint.h"
 
 #include <string.h>
 
@@ -96,7 +97,13 @@ public:
         RawKeyDown,
         KeyDown,
         KeyUp,
-        Char
+        Char,
+
+        // WebTouchEvent
+        TouchStart,
+        TouchMove,
+        TouchEnd,
+        TouchCancel,
     };
 
     enum Modifiers {
@@ -121,6 +128,16 @@ public:
     int modifiers;
     double timeStampSeconds;   // Seconds since epoch.
 
+    // Returns true if the WebInputEvent |type| is a mouse event.
+    static bool isMouseEventType(int type)
+    {
+        return type == MouseDown
+            || type == MouseUp
+            || type == MouseMove
+            || type == MouseEnter
+            || type == MouseLeave;
+    }
+
     // Returns true if the WebInputEvent |type| is a keyboard event.
     static bool isKeyboardEventType(int type)
     {
@@ -129,6 +146,15 @@ public:
             || type == KeyUp
             || type == Char;
     }
+
+    // Returns true if the WebInputEvent |type| is a touch event.
+    static bool isTouchEventType(int type)
+    {
+        return type == TouchStart
+            || type == TouchMove
+            || type == TouchEnd
+            || type == TouchCancel;
+    }
 };
 
 // WebKeyboardEvent -----------------------------------------------------------
@@ -255,6 +281,22 @@ public:
     }
 };
 
+// WebTouchEvent --------------------------------------------------------------
+
+class WebTouchEvent : public WebInputEvent {
+public:
+    static const int touchPointsLengthCap = 4;
+
+    int touchPointsLength;
+    WebTouchPoint touchPoints[touchPointsLengthCap];
+
+    WebTouchEvent(unsigned sizeParam = sizeof(WebTouchEvent))
+        : WebInputEvent(sizeParam)
+        , touchPointsLength(0)
+    {
+    }
+};
+
 } // namespace WebKit
 
 #endif