| Index: content/common/input/touch_action.h
|
| diff --git a/content/common/input/touch_action.h b/content/common/input/touch_action.h
|
| index 6bd2ddbc8bd7f6e67837e498f59598bd6a8a50ac..5eb09f9ada2e980bc7ee5b39171452124a52063f 100644
|
| --- a/content/common/input/touch_action.h
|
| +++ b/content/common/input/touch_action.h
|
| @@ -23,7 +23,11 @@ enum TouchAction {
|
|
|
| TOUCH_ACTION_PAN_X_Y = TOUCH_ACTION_PAN_X | TOUCH_ACTION_PAN_Y,
|
|
|
| - TOUCH_ACTION_MAX = (1 << 3) - 1
|
| + TOUCH_ACTION_PINCH_ZOOM = 1 << 3,
|
| +
|
| + TOUCH_ACTION_MANIPULATION = TOUCH_ACTION_PAN_X_Y | TOUCH_ACTION_PINCH_ZOOM,
|
| +
|
| + TOUCH_ACTION_MAX = (1 << 4) - 1
|
| };
|
|
|
| } // namespace content
|
|
|