| Index: third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| index 8fd1c06fde2231811e7bfa36daa6441909dbd773..f8bae4d2b0dfc5c79cee7a77efcb7ebdae64f02e 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
|
| @@ -381,34 +381,6 @@ enum DraggableRegionMode {
|
| kDraggableRegionNoDrag
|
| };
|
|
|
| -static const size_t kTouchActionBits = 6;
|
| -enum TouchAction {
|
| - kTouchActionNone = 0x0,
|
| - kTouchActionPanLeft = 0x1,
|
| - kTouchActionPanRight = 0x2,
|
| - kTouchActionPanX = kTouchActionPanLeft | kTouchActionPanRight,
|
| - kTouchActionPanUp = 0x4,
|
| - kTouchActionPanDown = 0x8,
|
| - kTouchActionPanY = kTouchActionPanUp | kTouchActionPanDown,
|
| - kTouchActionPan = kTouchActionPanX | kTouchActionPanY,
|
| - kTouchActionPinchZoom = 0x10,
|
| - kTouchActionManipulation = kTouchActionPan | kTouchActionPinchZoom,
|
| - kTouchActionDoubleTapZoom = 0x20,
|
| - kTouchActionAuto = kTouchActionManipulation | kTouchActionDoubleTapZoom
|
| -};
|
| -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 static_cast<TouchAction>(int(a) & int(b));
|
| -}
|
| -inline TouchAction& operator&=(TouchAction& a, TouchAction b) {
|
| - return a = a & b;
|
| -}
|
| -
|
| enum EIsolation { kIsolationAuto, kIsolationIsolate };
|
|
|
| static const size_t kContainmentBits = 4;
|
|
|