Simplify TouchAction enum to be a simple bit flag

third_party/WebKit/Source/core/style/ComputedStyleConstants.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 445 matching lines @@
     AutoFlowRow = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionRow,
     AutoFlowColumn = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionColumn,
     AutoFlowRowDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectionRow,
     AutoFlowColumnDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectionColumn
 };
 
 enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRegionNoDrag };
 
 static const size_t TouchActionBits = 6;
 enum TouchAction {
-    TouchActionAuto = 0x0,
-    TouchActionNone = 0x1,
-    TouchActionPanLeft = 0x2,
-    TouchActionPanRight = 0x4,
+    TouchActionNone = 0x0,
+    TouchActionPanLeft = 0x1,
+    TouchActionPanRight = 0x2,
     TouchActionPanX = TouchActionPanLeft | TouchActionPanRight,
-    TouchActionPanUp = 0x8,
-    TouchActionPanDown = 0x10,
+    TouchActionPanUp = 0x4,
+    TouchActionPanDown = 0x8,
     TouchActionPanY = TouchActionPanUp | TouchActionPanDown,
-    TouchActionPinchZoom = 0x20,
+    TouchActionPan = TouchActionPanX | TouchActionPanY,
+    TouchActionPinchZoom = 0x10,
+    TouchActionManipulation = TouchActionPan | TouchActionPinchZoom,
+    TouchActionDoubleTapZoom = 0x20,
+    TouchActionAuto = TouchActionManipulation | TouchActionDoubleTapZoom
 };
-inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction(int(a) | int(b)); }
+inline TouchAction operator| (TouchAction a, TouchAction b) { return static_cast<TouchAction>(int(a) | int(b)); }
 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; }
-inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction(int(a) & int(b)); }
+inline TouchAction operator& (TouchAction a, TouchAction b) { return static_cast<TouchAction>(int(a) & int(b)); }
 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; }
 
 enum EIsolation { IsolationAuto, IsolationIsolate };
 
 enum ItemPosition {
     ItemPositionAuto,
     ItemPositionStretch,
     ItemPositionBaseline,
     ItemPositionLastBaseline,
     ItemPositionCenter,
@@ skipping 49 matching lines @@
 
 enum ScrollSnapType {
     ScrollSnapTypeNone,
     ScrollSnapTypeMandatory,
     ScrollSnapTypeProximity
 };
 
 } // namespace blink
 
 #endif // ComputedStyleConstants_h