| Index: content/common/input/synthetic_pointer_action_params.h
|
| diff --git a/content/common/input/synthetic_pointer_action_params.h b/content/common/input/synthetic_pointer_action_params.h
|
| index 4e51f036b7352174c7fa2573d0d9b0cd090da414..1fefc846ffa0966686c23ae58f74655e8dabdbb1 100644
|
| --- a/content/common/input/synthetic_pointer_action_params.h
|
| +++ b/content/common/input/synthetic_pointer_action_params.h
|
| @@ -21,15 +21,15 @@ namespace content {
|
| struct CONTENT_EXPORT SyntheticPointerActionParams
|
| : public SyntheticGestureParams {
|
| public:
|
| - // Actions are queued up until we receive a PROCESS action, at which point
|
| - // we'll dispatch all queued events. A FINISH action will be received when
|
| - // we reach the end of the action sequence.
|
| + // All the pointer actions that will be dispatched together will be grouped
|
| + // in an array. A FINISH action will be received when we reach the end of the
|
| + // action sequence.
|
| enum class PointerActionType {
|
| NOT_INITIALIZED,
|
| PRESS,
|
| MOVE,
|
| RELEASE,
|
| - PROCESS,
|
| + IDLE,
|
| FINISH,
|
| POINTER_ACTION_TYPE_MAX = FINISH
|
| };
|
| @@ -49,10 +49,10 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| }
|
|
|
| void set_index(int index) {
|
| - DCHECK(pointer_action_type_ != PointerActionType::PROCESS &&
|
| - pointer_action_type_ != PointerActionType::FINISH);
|
| - // For all mouse pointer actions, the index should always be 0.
|
| - DCHECK(gesture_source_type != MOUSE_INPUT || index == 0);
|
| + DCHECK(pointer_action_type_ != PointerActionType::FINISH);
|
| + // The indexes of all mouse pointers should always be -1.
|
| + if (gesture_source_type == MOUSE_INPUT)
|
| + DCHECK(index == -1);
|
| index_ = index;
|
| }
|
|
|
| @@ -65,9 +65,9 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| PointerActionType pointer_action_type() const { return pointer_action_type_; }
|
|
|
| int index() const {
|
| - DCHECK(pointer_action_type_ != PointerActionType::PROCESS &&
|
| - pointer_action_type_ != PointerActionType::FINISH);
|
| - DCHECK(gesture_source_type != MOUSE_INPUT || index_ == 0);
|
| + DCHECK(pointer_action_type_ != PointerActionType::FINISH);
|
| + // For source type of mouse, the index should always be -1 and never change.
|
| + DCHECK(gesture_source_type != MOUSE_INPUT || index_ == -1);
|
| return index_;
|
| }
|
|
|
|
|