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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc

Issue 2336803003: Make SyntheticPointerAction to flush the pointer action sequence (Closed)
Patch Set: controller Created 4 years, 3 months 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
« content/browser/renderer_host/input/synthetic_gesture_controller.cc ('K') | « content/browser/renderer_host/input/synthetic_pointer_action_controller_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | content/browser/renderer_host/render_widget_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc
diff --git a/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc b/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc
index e4b0f9d22f73427a2a71e9ddcd7e0eb6b5db5553..8c43c655095c8a94199d8a774ac67af92aa581ac 100644
--- a/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc
+++ b/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc
@@ -119,7 +119,7 @@ class MockSyntheticPointerMouseActionTarget
class SyntheticPointerActionTest : public testing::Test {
public:
SyntheticPointerActionTest() {
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
std::fill(index_map_.begin(), index_map_.end(), -1);
num_success_ = 0;
num_failure_ = 0;
@@ -135,13 +135,15 @@ class SyntheticPointerActionTest : public testing::Test {
}
void ForwardSyntheticPointerAction() {
+ gesture_list_params_.param_list = action_param_list_;
pointer_action_.reset(new SyntheticPointerAction(
- std::move(action_param_list_), synthetic_pointer_.get(), &index_map_));
+ gesture_list_params_, synthetic_pointer_.get(), &index_map_));
SyntheticGesture::Result result = pointer_action_->ForwardInputEvents(
base::TimeTicks::Now(), target_.get());
- if (result == SyntheticGesture::GESTURE_FINISHED)
+ if (result == SyntheticGesture::GESTURE_FINISHED ||
+ result == SyntheticGesture::GESTURE_RUNNING)
num_success_++;
else
num_failure_++;
@@ -152,7 +154,8 @@ class SyntheticPointerActionTest : public testing::Test {
std::unique_ptr<MockSyntheticPointerActionTarget> target_;
std::unique_ptr<SyntheticGesture> pointer_action_;
std::unique_ptr<SyntheticPointer> synthetic_pointer_;
- std::unique_ptr<std::vector<SyntheticPointerActionParams>> action_param_list_;
+ SyntheticPointerActionListParams gesture_list_params_;
+ std::vector<SyntheticPointerActionParams> action_param_list_;
SyntheticPointerAction::IndexMap index_map_;
};
@@ -165,7 +168,7 @@ TEST_F(SyntheticPointerActionTest, PointerTouchAction) {
params0.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params0.set_index(0);
params0.set_position(gfx::PointF(54, 89));
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
MockSyntheticPointerTouchActionTarget* pointer_touch_target =
@@ -181,7 +184,7 @@ TEST_F(SyntheticPointerActionTest, PointerTouchAction) {
// Send a touch move for the first finger and a touch press for the second
// finger.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::MOVE);
params0.set_position(gfx::PointF(133, 156));
@@ -190,8 +193,8 @@ TEST_F(SyntheticPointerActionTest, PointerTouchAction) {
params1.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params1.set_index(1);
params1.set_position(gfx::PointF(79, 132));
- action_param_list_->push_back(params0);
- action_param_list_->push_back(params1);
+ action_param_list_.push_back(params0);
+ action_param_list_.push_back(params1);
ForwardSyntheticPointerAction();
EXPECT_EQ(2, num_success_);
@@ -209,11 +212,11 @@ TEST_F(SyntheticPointerActionTest, PointerTouchAction) {
ASSERT_EQ(pointer_touch_target->touch_length(), 2U);
// Send a touch move for the second finger.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params1.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::MOVE);
params1.set_position(gfx::PointF(87, 253));
- action_param_list_->push_back(params1);
+ action_param_list_.push_back(params1);
ForwardSyntheticPointerAction();
EXPECT_EQ(3, num_success_);
@@ -226,13 +229,13 @@ TEST_F(SyntheticPointerActionTest, PointerTouchAction) {
ASSERT_EQ(pointer_touch_target->touch_length(), 2U);
// Send touch releases for both fingers.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::RELEASE);
params1.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::RELEASE);
- action_param_list_->push_back(params0);
- action_param_list_->push_back(params1);
+ action_param_list_.push_back(params0);
+ action_param_list_.push_back(params1);
ForwardSyntheticPointerAction();
EXPECT_EQ(4, num_success_);
@@ -256,15 +259,15 @@ TEST_F(SyntheticPointerActionTest, PointerTouchActionIndexInvalid) {
params0.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params0.set_index(-1);
params0.set_position(gfx::PointF(54, 89));
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
EXPECT_EQ(0, num_success_);
EXPECT_EQ(1, num_failure_);
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.set_index(0);
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
MockSyntheticPointerTouchActionTarget* pointer_touch_target =
@@ -288,15 +291,15 @@ TEST_F(SyntheticPointerActionTest, PointerTouchActionSourceTypeInvalid) {
params0.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
params0.set_index(0);
params0.set_position(gfx::PointF(54, 89));
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
EXPECT_EQ(0, num_success_);
EXPECT_EQ(1, num_failure_);
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
MockSyntheticPointerTouchActionTarget* pointer_touch_target =
@@ -321,26 +324,26 @@ TEST_F(SyntheticPointerActionTest, PointerTouchActionTypeInvalid) {
params0.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params0.set_index(0);
params0.set_position(gfx::PointF(54, 89));
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
EXPECT_EQ(0, num_success_);
EXPECT_EQ(1, num_failure_);
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::RELEASE);
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
EXPECT_EQ(0, num_success_);
EXPECT_EQ(2, num_failure_);
// Send a touch press for one finger.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::PRESS);
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
MockSyntheticPointerTouchActionTarget* pointer_touch_target =
@@ -355,12 +358,12 @@ TEST_F(SyntheticPointerActionTest, PointerTouchActionTypeInvalid) {
ASSERT_EQ(pointer_touch_target->touch_length(), 1U);
// Cannot send a touch press again without releasing the finger.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params0.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params0.set_index(0);
params0.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::PRESS);
- action_param_list_->push_back(params0);
+ action_param_list_.push_back(params0);
ForwardSyntheticPointerAction();
EXPECT_EQ(1, num_success_);
@@ -376,7 +379,7 @@ TEST_F(SyntheticPointerActionTest, PointerMouseAction) {
params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
params.set_index(0);
params.set_position(gfx::PointF(189, 62));
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
@@ -389,11 +392,11 @@ TEST_F(SyntheticPointerActionTest, PointerMouseAction) {
EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::NoButton);
// Send a mouse down.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_position(gfx::PointF(189, 62));
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::PRESS);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(2, num_success_);
@@ -404,11 +407,11 @@ TEST_F(SyntheticPointerActionTest, PointerMouseAction) {
EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
// Send a mouse drag.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_position(gfx::PointF(326, 298));
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::MOVE);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(3, num_success_);
@@ -419,10 +422,10 @@ TEST_F(SyntheticPointerActionTest, PointerMouseAction) {
EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
// Send a mouse up.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::RELEASE);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(4, num_success_);
@@ -441,15 +444,15 @@ TEST_F(SyntheticPointerActionTest, PointerMouseActionSourceTypeInvalid) {
params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
params.set_index(0);
params.set_position(gfx::PointF(54, 89));
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(0, num_success_);
EXPECT_EQ(1, num_failure_);
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
@@ -471,7 +474,7 @@ TEST_F(SyntheticPointerActionTest, PointerMouseActionTypeInvalid) {
params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
params.set_index(0);
params.set_position(gfx::PointF(189, 62));
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
@@ -484,20 +487,20 @@ TEST_F(SyntheticPointerActionTest, PointerMouseActionTypeInvalid) {
EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::NoButton);
// Cannot send a mouse up without sending a mouse down first.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::RELEASE);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(1, num_success_);
EXPECT_EQ(1, num_failure_);
// Send a mouse down for one finger.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::PRESS);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(2, num_success_);
@@ -508,10 +511,10 @@ TEST_F(SyntheticPointerActionTest, PointerMouseActionTypeInvalid) {
EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
// Cannot send a mouse down again without releasing the mouse button.
- action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
+ action_param_list_.clear();
params.set_pointer_action_type(
SyntheticPointerActionParams::PointerActionType::PRESS);
- action_param_list_->push_back(params);
+ action_param_list_.push_back(params);
ForwardSyntheticPointerAction();
EXPECT_EQ(2, num_success_);
« content/browser/renderer_host/input/synthetic_gesture_controller.cc ('K') | « content/browser/renderer_host/input/synthetic_pointer_action_controller_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | content/browser/renderer_host/render_widget_host_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698