Chromium Code Reviews| Index: Source/core/rendering/style/RenderStyleConstants.h |
| diff --git a/Source/core/rendering/style/RenderStyleConstants.h b/Source/core/rendering/style/RenderStyleConstants.h |
| old mode 100644 |
| new mode 100755 |
| index a37868ee3e6c22e1591ecd596ebe42b21397507c..63943c47d6aca5725c38db10bd12d452dff23ce9 |
| --- a/Source/core/rendering/style/RenderStyleConstants.h |
| +++ b/Source/core/rendering/style/RenderStyleConstants.h |
| @@ -515,7 +515,17 @@ enum GridAutoFlow { AutoFlowNone, AutoFlowColumn, AutoFlowRow }; |
| enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRegionNoDrag }; |
| -enum TouchAction { TouchActionNone, TouchActionAuto }; |
| +static const size_t TouchActionBits = 3; |
| +enum TouchAction { |
| + TouchActionAuto = 0x0, |
| + TouchActionNone = 0x1, |
|
vivekg
2013/12/13 14:14:31
Same goes here as below comment about the enum.
gnana
2013/12/13 17:06:23
Done.
|
| + TouchActionPanX = 0x2, |
| + TouchActionPanY = 0x4 |
| +}; |
| +inline TouchAction operator| (TouchAction a, TouchAction b) { return 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 a = a & b; } |
| enum EIsolation { IsolationAuto, IsolationIsolate }; |