Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1644)

Unified Diff: content/common/input/synthetic_pointer_action_params.h

Issue 2336803003: Make SyntheticPointerAction to flush the pointer action sequence (Closed)
Patch Set: controller Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 dc6fa500fb11815d456d1e295c7efbf0b01ac994..6b4e74c358f30a47118e3e086a83f25e61d3261b 100644
--- a/content/common/input/synthetic_pointer_action_params.h
+++ b/content/common/input/synthetic_pointer_action_params.h
@@ -18,41 +18,30 @@ struct FuzzTraits;
namespace content {
-struct CONTENT_EXPORT SyntheticPointerActionParams
- : public SyntheticGestureParams {
+struct CONTENT_EXPORT SyntheticPointerActionParams {
public:
// 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.
+ // in an array.
enum class PointerActionType {
NOT_INITIALIZED,
PRESS,
MOVE,
RELEASE,
IDLE,
- FINISH,
- POINTER_ACTION_TYPE_MAX = FINISH
+ POINTER_ACTION_TYPE_MAX = IDLE
};
SyntheticPointerActionParams();
- SyntheticPointerActionParams(PointerActionType action_type,
- GestureSourceType source_type);
- SyntheticPointerActionParams(const SyntheticPointerActionParams& other);
- ~SyntheticPointerActionParams() override;
-
- GestureType GetGestureType() const override;
-
- static const SyntheticPointerActionParams* Cast(
- const SyntheticGestureParams* gesture_params);
+ SyntheticPointerActionParams(PointerActionType action_type);
+ ~SyntheticPointerActionParams();
void set_pointer_action_type(PointerActionType pointer_action_type) {
pointer_action_type_ = pointer_action_type;
}
void set_index(int index) {
- DCHECK(pointer_action_type_ != PointerActionType::FINISH);
- // For mouse pointers, the index should always be 0.
- DCHECK(gesture_source_type != MOUSE_INPUT || index == 0);
+ DCHECK_GE(index, 0);
+ DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap);
index_ = index;
}
@@ -65,9 +54,8 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
PointerActionType pointer_action_type() const { return pointer_action_type_; }
int index() const {
- DCHECK(pointer_action_type_ != PointerActionType::FINISH);
- // For mouse pointers, the index should always be 0.
- DCHECK(gesture_source_type != MOUSE_INPUT || index_ == 0);
+ DCHECK_GE(index_, 0);
+ DCHECK_LT(index_, blink::WebTouchEvent::kTouchesLengthCap);
return index_;
}
@@ -82,12 +70,13 @@ struct CONTENT_EXPORT SyntheticPointerActionParams
friend struct ipc_fuzzer::FuzzTraits<content::SyntheticPointerActionParams>;
PointerActionType pointer_action_type_;
- // Pass a position value when sending a press or move action.
+ // The position of the pointer, where it presses or moves to.
gfx::PointF position_;
- // Pass an index value except if the pointer_action_type_ is PROCESS.
+ // The index of the pointer in the pointer action sequence passed from the
+ // user API.
int index_;
};
} // namespace content
-#endif // CONTENT_COMMON_INPUT_SYNTHETIC_POINTER_ACTION_PARAMS_H_
+#endif // CONTENT_COMMON_INPUT_SYNTHETIC_POINTER_ACTION_PARAMS_H_
« no previous file with comments | « content/common/input/synthetic_pointer_action_list_params.cc ('k') | content/common/input/synthetic_pointer_action_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698