Make SyntheticPointerAction to flush the pointer action sequence

content/common/input/input_param_traits_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/input/input_param_traits.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/common/input/input_event.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
+#include "content/common/input/synthetic_pointer_action_list_params.h"
 #include "content/common/input/synthetic_pointer_action_params.h"
 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input_messages.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 
 namespace content {
@@ skipping 51 matching lines @@
 
   static void Compare(const SyntheticTapGestureParams* a,
                       const SyntheticTapGestureParams* b) {
     EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
     EXPECT_EQ(a->position, b->position);
     EXPECT_EQ(a->duration_ms, b->duration_ms);
   }
 
   static void Compare(const SyntheticPointerActionParams* a,
                       const SyntheticPointerActionParams* b) {
-    EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
+    EXPECT_EQ(a->gesture_source_type(), b->gesture_source_type());
     EXPECT_EQ(a->pointer_action_type(), b->pointer_action_type());
     if (a->pointer_action_type() ==
             SyntheticPointerActionParams::PointerActionType::PRESS ||
         a->pointer_action_type() ==
             SyntheticPointerActionParams::PointerActionType::MOVE) {
       EXPECT_EQ(a->position(), b->position());
     }
-    if (a->pointer_action_type() !=
-            SyntheticPointerActionParams::PointerActionType::FINISH) {
-      EXPECT_EQ(a->index(), b->index());
+    EXPECT_EQ(a->index(), b->index());
+  }
+
+  static void Compare(const SyntheticPointerActionListParams* a,
+                      const SyntheticPointerActionListParams* b) {
+    EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
+    EXPECT_EQ(a->params.size(), b->params.size());
+    for (size_t i = 0; i < a->params.size(); ++i) {
+      EXPECT_EQ(a->params[i].size(), b->params[i].size());
+      for (size_t j = 0; j < a->params[i].size(); ++j) {
+        Compare(&a->params[i][j], &b->params[i][j]);
+      }
     }
   }
 
   static void Compare(const SyntheticGesturePacket* a,
                       const SyntheticGesturePacket* b) {
     ASSERT_EQ(!!a, !!b);
     if (!a) return;
     ASSERT_EQ(!!a->gesture_params(), !!b->gesture_params());
     if (!a->gesture_params()) return;
     ASSERT_EQ(a->gesture_params()->GetGestureType(),
               b->gesture_params()->GetGestureType());
     switch (a->gesture_params()->GetGestureType()) {
       case SyntheticGestureParams::SMOOTH_SCROLL_GESTURE:
         Compare(SyntheticSmoothScrollGestureParams::Cast(a->gesture_params()),
                 SyntheticSmoothScrollGestureParams::Cast(b->gesture_params()));
         break;
       case SyntheticGestureParams::SMOOTH_DRAG_GESTURE:
         Compare(SyntheticSmoothDragGestureParams::Cast(a->gesture_params()),
                 SyntheticSmoothDragGestureParams::Cast(b->gesture_params()));
         break;
       case SyntheticGestureParams::PINCH_GESTURE:
         Compare(SyntheticPinchGestureParams::Cast(a->gesture_params()),
                 SyntheticPinchGestureParams::Cast(b->gesture_params()));
         break;
       case SyntheticGestureParams::TAP_GESTURE:
         Compare(SyntheticTapGestureParams::Cast(a->gesture_params()),
                 SyntheticTapGestureParams::Cast(b->gesture_params()));
         break;
-      case SyntheticGestureParams::POINTER_ACTION:
-        Compare(SyntheticPointerActionParams::Cast(a->gesture_params()),
-                SyntheticPointerActionParams::Cast(b->gesture_params()));
+      case SyntheticGestureParams::POINTER_ACTION_LIST:
+        Compare(SyntheticPointerActionListParams::Cast(a->gesture_params()),
+                SyntheticPointerActionListParams::Cast(b->gesture_params()));
         break;
     }
   }
 
   static void Verify(const InputEvents& events_in) {
     IPC::Message msg;
     IPC::ParamTraits<InputEvents>::Write(&msg, events_in);
 
     InputEvents events_out;
     base::PickleIterator iter(msg);
@@ skipping 129 matching lines @@
   gesture_params->position.SetPoint(798, 233);
   gesture_params->duration_ms = 13;
   ASSERT_EQ(SyntheticGestureParams::TAP_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
 
   Verify(packet_in);
 }
 
-TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsMove) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::MOVE,
-          SyntheticGestureParams::TOUCH_INPUT);
-  gesture_params->set_position(gfx::PointF(356, 287));
-  gesture_params->set_index(0);
-  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
+TEST_F(InputParamTraitsTest, SyntheticPointerActionListParamsMove) {
+  SyntheticPointerActionParams action_params(
+      SyntheticPointerActionParams::PointerActionType::MOVE,
+      SyntheticGestureParams::TOUCH_INPUT);
+  action_params.set_position(gfx::PointF(356, 287));
+  action_params.set_index(0);
+  SyntheticPointerActionListParams params;
+  params.PushPointerActionParams(action_params);
+  std::unique_ptr<SyntheticPointerActionListParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionListParams>(params);

[Navid Zolghadr, 2016/12/06 17:05:38]

Could we just pass the "action_params" to MakeUnique and not create "params" at
all as SyntheticPointerActionListParams has also a single argument constructor
which takes care of this. We are already testing the push functionality in the
other tests anyway.

[lanwei, 2016/12/07 19:04:27]

Done.

+  gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
+
+  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION_LIST,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
-TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsRelease) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::RELEASE,
-          SyntheticGestureParams::TOUCH_INPUT);
-  gesture_params->set_index(0);
-  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
+TEST_F(InputParamTraitsTest, SyntheticPointerActionListParamsPressRelease) {
+  SyntheticPointerActionParams action_params(
+      SyntheticPointerActionParams::PointerActionType::PRESS,
+      SyntheticGestureParams::TOUCH_INPUT);
+  action_params.set_index(0);
+  SyntheticPointerActionListParams params;
+  params.PushPointerActionParams(action_params);
+  action_params.set_pointer_action_type(
+      SyntheticPointerActionParams::PointerActionType::RELEASE);
+  params.PushPointerActionParams(action_params);
+  std::unique_ptr<SyntheticPointerActionListParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionListParams>(params);
+  gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
+
+  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION_LIST,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
-TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsProcess) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::IDLE,
-          SyntheticGestureParams::TOUCH_INPUT);
-  gesture_params->set_index(0);
-  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
+TEST_F(InputParamTraitsTest, SyntheticPointerActionListParamsTwoPresses) {
+  SyntheticPointerActionParams action_params(
+      SyntheticPointerActionParams::PointerActionType::PRESS,
+      SyntheticGestureParams::TOUCH_INPUT);
+  action_params.set_index(0);
+  SyntheticPointerActionListParams params;
+  params.PushPointerActionParams(action_params);
+  action_params.set_index(1);
+  params.PushPointerActionParams(0, action_params);
+  std::unique_ptr<SyntheticPointerActionListParams> gesture_params =
+      base::MakeUnique<SyntheticPointerActionListParams>(params);
+  gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
+
+  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION_LIST,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
-  Verify(packet_in);
-}
-
-TEST_F(InputParamTraitsTest, SyntheticPointerActionParamsFinish) {
-  std::unique_ptr<SyntheticPointerActionParams> gesture_params =
-      base::MakeUnique<SyntheticPointerActionParams>(
-          SyntheticPointerActionParams::PointerActionType::FINISH,
-          SyntheticGestureParams::TOUCH_INPUT);
-  ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION,
-            gesture_params->GetGestureType());
-  SyntheticGesturePacket packet_in;
-  packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
 }  // namespace
 }  // namespace content