| Index: content/browser/renderer_host/input/synthetic_pointer_action.cc
|
| diff --git a/content/browser/renderer_host/input/synthetic_pointer_action.cc b/content/browser/renderer_host/input/synthetic_pointer_action.cc
|
| index a701ce51f0281ea0165a6d4c803d16f93e797dc3..759116044461618f32486d7c596f10be42e7cc4f 100644
|
| --- a/content/browser/renderer_host/input/synthetic_pointer_action.cc
|
| +++ b/content/browser/renderer_host/input/synthetic_pointer_action.cc
|
| @@ -11,14 +11,14 @@
|
| namespace content {
|
|
|
| SyntheticPointerAction::SyntheticPointerAction(
|
| - const SyntheticPointerActionParams& params)
|
| + const SyntheticPointerActionListParams& params)
|
| : params_(params) {}
|
|
|
| SyntheticPointerAction::SyntheticPointerAction(
|
| - std::unique_ptr<std::vector<SyntheticPointerActionParams>> param_list,
|
| + const SyntheticPointerActionListParams& params,
|
| SyntheticPointer* synthetic_pointer,
|
| IndexMap* index_map)
|
| - : param_list_(std::move(param_list)),
|
| + : params_(params),
|
| synthetic_pointer_(synthetic_pointer),
|
| index_map_(index_map) {}
|
|
|
| @@ -28,6 +28,8 @@ SyntheticGesture::Result SyntheticPointerAction::ForwardInputEvents(
|
| const base::TimeTicks& timestamp,
|
| SyntheticGestureTarget* target) {
|
| DCHECK(synthetic_pointer_);
|
| + DCHECK_NE(synthetic_pointer_->SourceType(),
|
| + SyntheticGestureParams::DEFAULT_INPUT);
|
| return ForwardTouchOrMouseInputEvents(timestamp, target);
|
| }
|
|
|
| @@ -35,7 +37,7 @@ SyntheticGesture::Result SyntheticPointerAction::ForwardTouchOrMouseInputEvents(
|
| const base::TimeTicks& timestamp,
|
| SyntheticGestureTarget* target) {
|
| int point_index;
|
| - for (const SyntheticPointerActionParams& params : *param_list_) {
|
| + for (const SyntheticPointerActionParams& params : params_.param_list) {
|
| if (!UserInputCheck(params))
|
| return POINTER_ACTION_INPUT_INVALID;
|
|
|
| @@ -68,9 +70,6 @@ bool SyntheticPointerAction::UserInputCheck(
|
| if (params.index() < 0 || params.index() >= WebTouchEvent::kTouchesLengthCap)
|
| return false;
|
|
|
| - if (synthetic_pointer_->SourceType() != params.gesture_source_type)
|
| - return false;
|
| -
|
| if (params.pointer_action_type() ==
|
| SyntheticPointerActionParams::PointerActionType::PRESS &&
|
| GetPointIndex(params.index()) >= 0) {
|
|
|