| Index: content/common/input/touch_action.h
|
| diff --git a/content/common/input/touch_action.h b/content/common/input/touch_action.h
|
| index 5eb09f9ada2e980bc7ee5b39171452124a52063f..89f000df7bd19124496f57e61bafb9874332c434 100644
|
| --- a/content/common/input/touch_action.h
|
| +++ b/content/common/input/touch_action.h
|
| @@ -17,17 +17,25 @@ enum TouchAction {
|
| // No scrolling or zooming allowed.
|
| TOUCH_ACTION_NONE = 1 << 0,
|
|
|
| - TOUCH_ACTION_PAN_X = 1 << 1,
|
| + TOUCH_ACTION_PAN_LEFT = 1 << 1,
|
|
|
| - TOUCH_ACTION_PAN_Y = 1 << 2,
|
| + TOUCH_ACTION_PAN_RIGHT = 1 << 2,
|
| +
|
| + TOUCH_ACTION_PAN_X = TOUCH_ACTION_PAN_LEFT | TOUCH_ACTION_PAN_RIGHT,
|
| +
|
| + TOUCH_ACTION_PAN_UP = 1 << 3,
|
| +
|
| + TOUCH_ACTION_PAN_DOWN = 1 << 4,
|
| +
|
| + TOUCH_ACTION_PAN_Y = TOUCH_ACTION_PAN_UP | TOUCH_ACTION_PAN_DOWN,
|
|
|
| TOUCH_ACTION_PAN_X_Y = TOUCH_ACTION_PAN_X | TOUCH_ACTION_PAN_Y,
|
|
|
| - TOUCH_ACTION_PINCH_ZOOM = 1 << 3,
|
| + TOUCH_ACTION_PINCH_ZOOM = 1 << 5,
|
|
|
| TOUCH_ACTION_MANIPULATION = TOUCH_ACTION_PAN_X_Y | TOUCH_ACTION_PINCH_ZOOM,
|
|
|
| - TOUCH_ACTION_MAX = (1 << 4) - 1
|
| + TOUCH_ACTION_MAX = (1 << 6) - 1
|
| };
|
|
|
| } // namespace content
|
|
|