Index: content/common/input_messages.h |
diff --git a/content/common/input_messages.h b/content/common/input_messages.h |
index 80b0536d05494f55f689d66c91c32a5f4dd7e5c4..38d658d41c5bb92c07d22673d7edc2a7a38a4e57 100644 |
--- a/content/common/input_messages.h |
+++ b/content/common/input_messages.h |
@@ -43,8 +43,13 @@ IPC_ENUM_TRAITS_MAX_VALUE( |
IPC_ENUM_TRAITS_MAX_VALUE( |
content::SyntheticGestureParams::GestureType, |
content::SyntheticGestureParams::SYNTHETIC_GESTURE_TYPE_MAX) |
-IPC_ENUM_TRAITS_MAX_VALUE(content::TouchAction, |
- content::TOUCH_ACTION_MAX) |
+IPC_ENUM_TRAITS_VALIDATE(content::TouchAction, ( |
+ value >= 0 && |
+ value <= content::TOUCH_ACTION_MAX && |
+ (!(value & content::TOUCH_ACTION_NONE) || |
+ (value == content::TOUCH_ACTION_NONE)) && |
+ (!(value & content::TOUCH_ACTION_PINCH_ZOOM) || |
+ (value == content::TOUCH_ACTION_MANIPULATION)))) |
IPC_STRUCT_TRAITS_BEGIN(content::EditCommand) |
IPC_STRUCT_TRAITS_MEMBER(name) |