Rename SyntheticPointer to SyntheticPointerDriver

content/browser/renderer_host/input/synthetic_pointer_action.cc

Index: content/browser/renderer_host/input/synthetic_pointer_action.cc
diff --git a/content/browser/renderer_host/input/synthetic_pointer_action.cc b/content/browser/renderer_host/input/synthetic_pointer_action.cc
index a701ce51f0281ea0165a6d4c803d16f93e797dc3..4ded9699217cb936afa49647825451fa9959a8a7 100644
--- a/content/browser/renderer_host/input/synthetic_pointer_action.cc
+++ b/content/browser/renderer_host/input/synthetic_pointer_action.cc
@@ -16,77 +16,77 @@ SyntheticPointerAction::SyntheticPointerAction(
 
 SyntheticPointerAction::SyntheticPointerAction(
     std::unique_ptr<std::vector<SyntheticPointerActionParams>> param_list,
-    SyntheticPointer* synthetic_pointer,
-    IndexMap* index_map)
+    SyntheticPointerDriver* synthetic_pointer_driver)
     : param_list_(std::move(param_list)),
-      synthetic_pointer_(synthetic_pointer),
-      index_map_(index_map) {}
+      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))
       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);
+        synthetic_pointer_driver_->Press(params.index(), params.position().x(),
+                                         params.position().y(), target,
+                                         timestamp);
         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.index(), params.position().x(),
+                                        params.position().y(), target,
+                                        timestamp);
         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(), target, timestamp);
         break;
       default:
         return POINTER_ACTION_INPUT_INVALID;
     }
   }
-  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)
+  if (params.index() < 0 ||
+      (synthetic_pointer_driver_->SourceType() ==
+           SyntheticGestureParams::TOUCH_INPUT &&
+       params.index() >= WebTouchEvent::kTouchesLengthCap)) {

[tdresser, 2016/11/07 17:44:11]

I'd split this up to make it a bit more legible.

bool touch_index_exceeds_bounds = ...;

[lanwei, 2016/11/07 23:28:48]

Done.

     return false;
+  }
 
-  if (synthetic_pointer_->SourceType() != params.gesture_source_type)
+  if (synthetic_pointer_driver_->SourceType() != params.gesture_source_type)
     return false;
 
   if (params.pointer_action_type() ==
           SyntheticPointerActionParams::PointerActionType::PRESS &&
-      GetPointIndex(params.index()) >= 0) {
+      synthetic_pointer_driver_->GetPointIndex(params.index()) >= 0) {
     return false;
   }
 
-  if (synthetic_pointer_->SourceType() == SyntheticGestureParams::TOUCH_INPUT &&
+  if (synthetic_pointer_driver_->SourceType() ==
+          SyntheticGestureParams::TOUCH_INPUT &&
       params.pointer_action_type() ==
           SyntheticPointerActionParams::PointerActionType::MOVE &&
-      GetPointIndex(params.index()) < 0) {
+      synthetic_pointer_driver_->GetPointIndex(params.index()) < 0) {
     return false;
   }
 
   if (params.pointer_action_type() ==
           SyntheticPointerActionParams::PointerActionType::RELEASE &&
-      GetPointIndex(params.index()) < 0) {
+      synthetic_pointer_driver_->GetPointIndex(params.index()) < 0) {
     return false;
   }
   return true;