| 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..a11d6ee6bbacfb5cd80ab9461042c80442937663 100644
|
| --- a/content/common/input/synthetic_pointer_action_params.h
|
| +++ b/content/common/input/synthetic_pointer_action_params.h
|
| @@ -18,8 +18,7 @@ struct FuzzTraits;
|
|
|
| namespace content {
|
|
|
| -struct CONTENT_EXPORT SyntheticPointerActionParams
|
| - : public SyntheticGestureParams {
|
| +struct CONTENT_EXPORT SyntheticPointerActionParams {
|
| 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
|
| @@ -35,14 +34,10 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| };
|
|
|
| SyntheticPointerActionParams();
|
| - explicit SyntheticPointerActionParams(PointerActionType type);
|
| - SyntheticPointerActionParams(const SyntheticPointerActionParams& other);
|
| - ~SyntheticPointerActionParams() override;
|
| -
|
| - GestureType GetGestureType() const override;
|
| -
|
| - static const SyntheticPointerActionParams* Cast(
|
| - const SyntheticGestureParams* gesture_params);
|
| + SyntheticPointerActionParams(
|
| + SyntheticGestureParams::GestureSourceType source_type,
|
| + PointerActionType action_type);
|
| + ~SyntheticPointerActionParams();
|
|
|
| void set_pointer_action_type(PointerActionType pointer_action_type) {
|
| pointer_action_type_ = pointer_action_type;
|
| @@ -52,7 +47,8 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| 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(gesture_source_type_ != SyntheticGestureParams::MOUSE_INPUT ||
|
| + index == 0);
|
| index_ = index;
|
| }
|
|
|
| @@ -67,7 +63,8 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| int index() const {
|
| DCHECK(pointer_action_type_ != PointerActionType::PROCESS &&
|
| pointer_action_type_ != PointerActionType::FINISH);
|
| - DCHECK(gesture_source_type != MOUSE_INPUT || index_ == 0);
|
| + DCHECK(gesture_source_type_ != SyntheticGestureParams::MOUSE_INPUT ||
|
| + index_ == 0);
|
| return index_;
|
| }
|
|
|
| @@ -81,6 +78,7 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
|
| friend struct IPC::ParamTraits<content::SyntheticPointerActionParams>;
|
| friend struct ipc_fuzzer::FuzzTraits<content::SyntheticPointerActionParams>;
|
|
|
| + SyntheticGestureParams::GestureSourceType gesture_source_type_;
|
| PointerActionType pointer_action_type_;
|
| // Pass a position value when sending a press or move action.
|
| gfx::PointF position_;
|
|
|