| Index: Source/core/rendering/style/RenderStyleConstants.h
|
| diff --git a/Source/core/rendering/style/RenderStyleConstants.h b/Source/core/rendering/style/RenderStyleConstants.h
|
| index 020ed1cb4e4edcdead438a74836128777f71c099..7da8d170bfc3c5c4ba351bc482c78c326326a1db 100644
|
| --- a/Source/core/rendering/style/RenderStyleConstants.h
|
| +++ b/Source/core/rendering/style/RenderStyleConstants.h
|
| @@ -511,12 +511,13 @@ enum GridAutoFlow { AutoFlowNone, AutoFlowColumn, AutoFlowRow };
|
|
|
| enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRegionNoDrag };
|
|
|
| -static const size_t TouchActionBits = 3;
|
| +static const size_t TouchActionBits = 4;
|
| enum TouchAction {
|
| TouchActionAuto = 0x0,
|
| TouchActionNone = 0x1,
|
| TouchActionPanX = 0x2,
|
| - TouchActionPanY = 0x4
|
| + TouchActionPanY = 0x4,
|
| + TouchActionPinchZoom = 0x8,
|
| };
|
| inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction(int(a) | int(b)); }
|
| inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; }
|
|
|