Rename SyntheticPointer to SyntheticPointerDriver

content/browser/renderer_host/input/synthetic_pointer_action.cc

 // Copyright 2015 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/browser/renderer_host/input/synthetic_pointer_action.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/latency_info.h"
 
 namespace content {
 
 SyntheticPointerAction::SyntheticPointerAction(
     const SyntheticPointerActionParams& params)
     : params_(params) {}
 
 SyntheticPointerAction::SyntheticPointerAction(
-    std::unique_ptr<std::vector<SyntheticPointerActionParams>> param_list,
-    SyntheticPointer* synthetic_pointer,
-    IndexMap* index_map)
-    : param_list_(std::move(param_list)),
-      synthetic_pointer_(synthetic_pointer),
-      index_map_(index_map) {}
+    std::vector<SyntheticPointerActionParams>* param_list,
+    SyntheticPointerDriver* synthetic_pointer_driver)
+    : param_list_(param_list),
+      synthetic_pointer_driver_(synthetic_pointer_driver) {}
 
 SyntheticPointerAction::~SyntheticPointerAction() {}
 
 SyntheticGesture::Result SyntheticPointerAction::ForwardInputEvents(
     const base::TimeTicks& timestamp,
     SyntheticGestureTarget* target) {
-  DCHECK(synthetic_pointer_);
+  DCHECK(synthetic_pointer_driver_);
   return ForwardTouchOrMouseInputEvents(timestamp, target);
 }
 
 SyntheticGesture::Result SyntheticPointerAction::ForwardTouchOrMouseInputEvents(
     const base::TimeTicks& timestamp,
     SyntheticGestureTarget* target) {
-  int point_index;
-  for (const SyntheticPointerActionParams& params : *param_list_) {
-    if (!UserInputCheck(params))
+  for (size_t i = 0; i < param_list_->size(); ++i) {

[tdresser, 2016/11/10 14:58:32]

Why did we switch away from a range based for loop?

[lanwei, 2016/11/10 19:45:22]

I thought I could not change params's index in its caller, I thought it is a
copy. I was wrong, it works the same.

+    SyntheticPointerActionParams& params = (*param_list_)[i];
+    if (!synthetic_pointer_driver_->UserInputCheck(params))
       return POINTER_ACTION_INPUT_INVALID;
 
     switch (params.pointer_action_type()) {
-      case SyntheticPointerActionParams::PointerActionType::PRESS:
-        point_index = synthetic_pointer_->Press(
-            params.position().x(), params.position().y(), target, timestamp);
-        SetPointIndex(params.index(), point_index);
+      case SyntheticPointerActionParams::PointerActionType::PRESS: {
+        int index = synthetic_pointer_driver_->Press(params.position().x(),
+                                                     params.position().y());
+        params.set_index(index);
         break;
+      }
       case SyntheticPointerActionParams::PointerActionType::MOVE:
-        point_index = GetPointIndex(params.index());
-        synthetic_pointer_->Move(point_index, params.position().x(),
-                                 params.position().y(), target, timestamp);
+        synthetic_pointer_driver_->Move(params.position().x(),
+                                        params.position().y(), params.index());
         break;
       case SyntheticPointerActionParams::PointerActionType::RELEASE:
-        point_index = GetPointIndex(params.index());
-        synthetic_pointer_->Release(point_index, target, timestamp);
-        SetPointIndex(params.index(), -1);
+        synthetic_pointer_driver_->Release(params.index());
+        params.set_index(-1);
         break;
       default:

[tdresser, 2016/11/10 14:58:32]

Should we explicitly handle the other cases here?

[lanwei, 2016/11/10 19:45:22]

The case for finish may change later, but 'return GESTURE_FINISHED' makes sense
right now.

-        return POINTER_ACTION_INPUT_INVALID;
+        break;
     }
   }
-  synthetic_pointer_->DispatchEvent(target, timestamp);
+  synthetic_pointer_driver_->DispatchEvent(target, timestamp);
   return GESTURE_FINISHED;
 }
 
-bool SyntheticPointerAction::UserInputCheck(
-    const SyntheticPointerActionParams& params) {
-  if (params.index() < 0 || params.index() >= WebTouchEvent::kTouchesLengthCap)
-    return false;
-
-  if (synthetic_pointer_->SourceType() != params.gesture_source_type)
-    return false;
-
-  if (params.pointer_action_type() ==
-          SyntheticPointerActionParams::PointerActionType::PRESS &&
-      GetPointIndex(params.index()) >= 0) {
-    return false;
-  }
-
-  if (synthetic_pointer_->SourceType() == SyntheticGestureParams::TOUCH_INPUT &&
-      params.pointer_action_type() ==
-          SyntheticPointerActionParams::PointerActionType::MOVE &&
-      GetPointIndex(params.index()) < 0) {
-    return false;
-  }
-
-  if (params.pointer_action_type() ==
-          SyntheticPointerActionParams::PointerActionType::RELEASE &&
-      GetPointIndex(params.index()) < 0) {
-    return false;
-  }
-  return true;
-}
-
 }  // namespace content