Simplify TouchAction enum to be a simple bit flag

third_party/WebKit/public/web/WebTouchAction.h

 /*
  * Copyright (C) 2013 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebTouchAction_h
 #define WebTouchAction_h
 
 namespace blink {
 
 // Flags for permitted touch actions, specified in http://w3c.github.io/pointerevents/#the-touch-action-css-property.
 enum WebTouchAction {
-    WebTouchActionAuto = 0x0,
-    WebTouchActionNone = 0x1,
-    WebTouchActionPanLeft = 0x2,
-    WebTouchActionPanRight = 0x4,
+    WebTouchActionNone = 0x0,
+    WebTouchActionPanLeft = 0x1,
+    WebTouchActionPanRight = 0x2,
     WebTouchActionPanX = WebTouchActionPanLeft | WebTouchActionPanRight,
-    WebTouchActionPanUp = 0x8,
-    WebTouchActionPanDown = 0x10,
+    WebTouchActionPanUp = 0x4,
+    WebTouchActionPanDown = 0x8,
     WebTouchActionPanY = WebTouchActionPanUp | WebTouchActionPanDown,
-    WebTouchActionPinchZoom = 0x20,
+    WebTouchActionPan = WebTouchActionPanX | WebTouchActionPanY,
+    WebTouchActionPinchZoom = 0x10,
+    WebTouchActionManipulation = WebTouchActionPan | WebTouchActionPinchZoom,
+    WebTouchActionDoubleTapZoom = 0x20,
+    WebTouchActionAuto = WebTouchActionManipulation | WebTouchActionDoubleTapZoom
 };
-inline WebTouchAction operator| (WebTouchAction a, WebTouchAction b) { return WebTouchAction(int(a) | int(b)); }
+inline WebTouchAction operator| (WebTouchAction a, WebTouchAction b) { return static_cast<WebTouchAction>(int(a) | int(b)); }
 inline WebTouchAction& operator|= (WebTouchAction& a, WebTouchAction b) { return a = a | b; }
-inline WebTouchAction operator& (WebTouchAction a, WebTouchAction b) { return WebTouchAction(int(a) & int(b)); }
+inline WebTouchAction operator& (WebTouchAction a, WebTouchAction b) { return static_cast<WebTouchAction>(int(a) & int(b)); }
 inline WebTouchAction& operator&= (WebTouchAction& a, WebTouchAction b) { return a = a & b; }
 
 
 } // namespace blink
 
 #endif