Replace pen actions in pointer event tests with pointerActionSequence

content/renderer/gpu/actions_parser.cc

 // Copyright (c) 2016 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/renderer/gpu/actions_parser.h"
 
 #include "base/format_macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 15 matching lines @@
     return SyntheticPointerActionParams::PointerActionType::IDLE;
   return SyntheticPointerActionParams::PointerActionType::NOT_INITIALIZED;
 }
 
 SyntheticGestureParams::GestureSourceType ToSyntheticGestureSourceType(
     std::string source_type) {
   if (source_type == "touch")
     return SyntheticGestureParams::TOUCH_INPUT;
   else if (source_type == "mouse")
     return SyntheticGestureParams::MOUSE_INPUT;
+  else if (source_type == "pen")
+    return SyntheticGestureParams::PEN_INPUT;
   else
     return SyntheticGestureParams::DEFAULT_INPUT;
 }
 
 SyntheticPointerActionParams::Button ToSyntheticMouseButton(
     std::string button) {
   if (button == "left")
     return SyntheticPointerActionParams::Button::LEFT;
   if (button == "middle")
     return SyntheticPointerActionParams::Button::MIDDLE;
   if (button == "right")
     return SyntheticPointerActionParams::Button::RIGHT;
   NOTREACHED() << "Unexpected button";
   return SyntheticPointerActionParams::Button();
 }
 
 }  // namespace
 
 ActionsParser::ActionsParser(base::Value* pointer_actions_value)
     : longest_action_sequence_(0),
       pointer_actions_value_(pointer_actions_value),
       action_index_(0) {}
 
 ActionsParser::~ActionsParser() {}
 
 bool ActionsParser::ParsePointerActionSequence() {
   const base::ListValue* pointer_list;
-  if (!pointer_actions_value_->GetAsList(&pointer_list)) {
+  if (!pointer_actions_value_ ||
+      !pointer_actions_value_->GetAsList(&pointer_list)) {
     error_message_ =
         base::StringPrintf("pointer_list is missing or not a list");
     return false;
   }
 
   for (const auto& pointer_value : *pointer_list) {
     const base::DictionaryValue* pointer_actions;
     if (!pointer_value->GetAsDictionary(&pointer_actions)) {
       error_message_ =
           base::StringPrintf("pointer actions is missing or not a dictionary");
@@ skipping 25 matching lines @@
   return true;
 }
 
 bool ActionsParser::ParsePointerActions(const base::DictionaryValue& pointer) {
   std::string source_type;
   if (!pointer.GetString("source", &source_type)) {
     error_message_ =
         base::StringPrintf("source type is missing or not a string");
     return false;
   } else if (source_type != "touch" && source_type != "mouse" &&
-             source_type != "pointer") {
+             source_type != "pen") {
     error_message_ =
         base::StringPrintf("source type is an unsupported input source");
     return false;
   }
 
   if (source_type_.empty()) {
     source_type_ = source_type;
 
 #if defined(OS_MACOSX)
     if (source_type == "touch") {
@@ skipping 137 matching lines @@
 
   // We queue all the IDLE actions in the action parameter list to make sure we
   // will pause long enough on the given pointer.
   for (int count = 1; count < num_idle; ++count)
     param_list.push_back(action_param);
 
   return true;
 }
 
 }  // namespace content