| Index: content/browser/renderer_host/input/synthetic_pointer_action.h
|
| diff --git a/content/browser/renderer_host/input/synthetic_pointer_action.h b/content/browser/renderer_host/input/synthetic_pointer_action.h
|
| index a87ef7370d6b9e0633d500045a1005406f169a46..e346e7d9dac66893420ff8e2507d954def98d56f 100644
|
| --- a/content/browser/renderer_host/input/synthetic_pointer_action.h
|
| +++ b/content/browser/renderer_host/input/synthetic_pointer_action.h
|
| @@ -5,11 +5,10 @@
|
| #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_POINTER_ACTION_H_
|
| #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_POINTER_ACTION_H_
|
|
|
| -#include <array>
|
| #include "base/macros.h"
|
| #include "content/browser/renderer_host/input/synthetic_gesture.h"
|
| #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
|
| -#include "content/browser/renderer_host/input/synthetic_pointer.h"
|
| +#include "content/browser/renderer_host/input/synthetic_pointer_driver.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/input/synthetic_pointer_action_params.h"
|
|
|
| @@ -19,12 +18,8 @@ namespace content {
|
|
|
| class CONTENT_EXPORT SyntheticPointerAction : public SyntheticGesture {
|
| public:
|
| - using IndexMap = std::array<int, WebTouchEvent::kTouchesLengthCap>;
|
| -
|
| - SyntheticPointerAction(
|
| - std::unique_ptr<std::vector<SyntheticPointerActionParams>> param_list,
|
| - SyntheticPointer* synthetic_pointer,
|
| - IndexMap* index_map);
|
| + SyntheticPointerAction(std::vector<SyntheticPointerActionParams>* param_list,
|
| + SyntheticPointerDriver* synthetic_pointer_driver);
|
| ~SyntheticPointerAction() override;
|
|
|
| SyntheticGesture::Result ForwardInputEvents(
|
| @@ -36,26 +31,17 @@ class CONTENT_EXPORT SyntheticPointerAction : public SyntheticGesture {
|
| SyntheticGesture::Result ForwardTouchOrMouseInputEvents(
|
| const base::TimeTicks& timestamp,
|
| SyntheticGestureTarget* target);
|
| - int GetPointIndex(int index) const { return (*index_map_)[index]; }
|
| - void SetPointIndex(int index, int point_index) {
|
| - (*index_map_)[index] = point_index;
|
| - }
|
| -
|
| - // Check if the user inputs in the SyntheticPointerActionParams can generate
|
| - // a valid sequence of pointer actions.
|
| - bool UserInputCheck(const SyntheticPointerActionParams& params);
|
|
|
| // SyntheticGestureController is responsible to create the
|
| // SyntheticPointerActions and control when to forward them.
|
| - // This will be passed from SyntheticGestureController, which will reset its
|
| - // value to push a new batch of action parameters.
|
| - // This contains a list of pointer actions which will be dispatched together.
|
| - const std::unique_ptr<std::vector<SyntheticPointerActionParams>> param_list_;
|
| +
|
| // These two objects will be owned by SyntheticGestureController, which
|
| // will manage their lifetime by initiating them when it starts processing a
|
| // pointer action sequence and resetting them when it finishes.
|
| - SyntheticPointer* synthetic_pointer_;
|
| - IndexMap* index_map_;
|
| + // param_list_ contains a list of pointer actions which will be dispatched
|
| + // together.
|
| + std::vector<SyntheticPointerActionParams>* param_list_;
|
| + SyntheticPointerDriver* synthetic_pointer_driver_;
|
|
|
| SyntheticPointerActionParams params_;
|
|
|
|
|