Replace touch actions in pointer event tests with pointerActionSequence

content/renderer/gpu/actions_parser.cc

Index: content/renderer/gpu/actions_parser.cc
diff --git a/content/renderer/gpu/actions_parser.cc b/content/renderer/gpu/actions_parser.cc
index 534c0d1d00794d4b4370b292c43b2a4f476c7e3f..ff58af1f0908958bb2cedf013b2d7f87fbf92976 100644
--- a/content/renderer/gpu/actions_parser.cc
+++ b/content/renderer/gpu/actions_parser.cc
@@ -8,6 +8,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "cc/output/begin_frame_args.h"
 
 namespace content {
 
@@ -131,9 +132,6 @@ bool ActionsParser::ParsePointerActions(const base::DictionaryValue& pointer) {
     return false;
   }
 
-  if (actions->GetSize() > longest_action_sequence_)
-    longest_action_sequence_ = actions->GetSize();
-
   if (!ParseActions(*actions))
     return false;
 
@@ -152,6 +150,10 @@ bool ActionsParser::ParseActions(const base::ListValue& actions) {
       return false;
     }
   }
+
+  if (param_list.size() > longest_action_sequence_)
+    longest_action_sequence_ = param_list.size();
+
   pointer_actions_list_.push_back(param_list);
   return true;
 }
@@ -190,6 +192,23 @@ bool ActionsParser::ParseAction(
     return false;
   }
 
+  double duration = 0;
+  int num_idle = 0;
+  if (pointer_action_type ==
+      SyntheticPointerActionParams::PointerActionType::IDLE) {
+    num_idle = 1;
+    if (action.HasKey("duration") && !action.GetDouble("duration", &duration)) {
+      error_message_ = base::StringPrintf(
+          "actions[%d].actions.x is not a number", action_index_);
+      return false;
+    }
+  }
+
+  if (duration > 0) {
+    num_idle = static_cast<int>(std::ceil(
+        duration / cc::BeginFrameArgs::DefaultInterval().InSecondsF()));
+  }
+
   SyntheticPointerActionParams action_param(pointer_action_type);
   action_param.set_index(action_index_);
   if (pointer_action_type ==
@@ -199,6 +218,16 @@ bool ActionsParser::ParseAction(
     action_param.set_position(gfx::PointF(position_x, position_y));
   }
   param_list.push_back(action_param);
+

[tdresser, 2017/01/16 15:45:30]

Add a comment explaining what's happening here.

[lanwei, 2017/01/16 19:55:04]

Done.

+  if (pointer_action_type !=
+          SyntheticPointerActionParams::PointerActionType::IDLE ||
+      num_idle == 1) {

[Navid Zolghadr, 2017/01/16 15:30:08]

nit: I believe this is okay to remove the "|| num_idle == 1" part in this
condition.

[lanwei, 2017/01/16 19:55:04]

Done.

+    return true;

[tdresser, 2017/01/16 15:45:30]

Do we need this return?

[lanwei, 2017/01/16 19:55:04]

Done.

+  }
+
+  for (int count = 1; count < num_idle; ++count)
+    param_list.push_back(action_param);
+
   return true;
 }