Prepare SyntheticPointerAction to handle touch actions for multiple fingers

content/browser/renderer_host/input/synthetic_gesture_controller.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_CONTROLLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_CONTROLLER_H_
 
 #include <memory>
 #include <queue>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
+#include "content/browser/renderer_host/input/synthetic_pointer_action.h"

[tdresser, 2016/05/13 13:58:04]

Where is this used?

[lanwei, 2016/05/19 16:04:12]

Deleted.

 #include "content/common/content_export.h"
+#include "content/common/input/synthetic_gesture_packet.h"

[tdresser, 2016/05/13 13:58:04]

Where is this used?

 #include "content/common/input/synthetic_gesture_params.h"
+#include "content/common/input/synthetic_pointer_action_params.h"
 
 namespace content {
 
 class SyntheticGestureTarget;
+using blink::WebTouchEvent;

[tdresser, 2016/05/13 13:58:04]

Where is this used?

 
 // Controls a synthetic gesture.
 // Repeatedly invokes the gesture object's ForwardInputEvent method to send
 // input events to the platform until the gesture has finished.
 class CONTENT_EXPORT SyntheticGestureController {
  public:
   explicit SyntheticGestureController(
       std::unique_ptr<SyntheticGestureTarget> gesture_target);
   virtual ~SyntheticGestureController();
 
   typedef base::Callback<void(SyntheticGesture::Result)>
       OnGestureCompleteCallback;
   void QueueSyntheticGesture(
       std::unique_ptr<SyntheticGesture> synthetic_gesture,
       const OnGestureCompleteCallback& completion_callback);
 
+  void QueueSyntheticPointerAction(
+      const SyntheticPointerActionParams& gesture_params,
+      const OnGestureCompleteCallback& completion_callback);
+
   // Forward input events of the currently processed gesture.
   void Flush(base::TimeTicks timestamp);
 
   // To be called when all events generated from the current gesture have been
   // fully flushed from the input pipeline (i.e., sent, processed and ack'ed).
   void OnDidFlushInput();
 
+  void ResetSyntheticPointer();
+
+  // Only for tests in SyntheticGestureControllerTest.
+  int PointerIndex(int index) const;

[tdresser, 2016/05/13 13:58:04]

Add this method in the test file by making instantiating a subclass of
SyntheticGestureController in the test, which adds this method.

You'll need to make the index_map_ (or whatever owns it) protected, but that's
fine.

+
  private:
   void StartGesture(const SyntheticGesture& gesture);
   void StopGesture(const SyntheticGesture& gesture,
                    const OnGestureCompleteCallback& completion_callback,
                    SyntheticGesture::Result result);
 
+  void SetSyntheticPointer(const SyntheticPointerActionParams& gesture_params);
+
   std::unique_ptr<SyntheticGestureTarget> gesture_target_;
   std::unique_ptr<SyntheticGesture::Result> pending_gesture_result_;
 
   // A queue of gesture/callback pairs.  Implemented as two queues to
   // simplify the ownership of SyntheticGesture pointers.
   class GestureAndCallbackQueue {
   public:
     GestureAndCallbackQueue();
     ~GestureAndCallbackQueue();
     void Push(std::unique_ptr<SyntheticGesture> gesture,
@@ skipping 13 matching lines @@
     }
     bool IsEmpty() {
       CHECK(gestures_.empty() == callbacks_.empty());
       return gestures_.empty();
     }
    private:
     ScopedVector<SyntheticGesture> gestures_;
     std::queue<OnGestureCompleteCallback> callbacks_;
   } pending_gesture_queue_;
 
+  std::vector<SyntheticPointerActionParams> action_param_list_;

[tdresser, 2016/05/13 13:58:04]

We're going to be adding a bunch of state and logic to this class.

Would it be better to make a SyntheticPointerGestureController, which is
contained by this class?

We would then just forward a few method calls on the SyntheticGestureController
to the SyntheticPointerGestureController.

I suspect in the long term, that will result in cleaner code.

+  std::unique_ptr<SyntheticPointer> synthetic_pointer_;
+  std::vector<int> index_map_;

[tdresser, 2016/05/13 13:58:04]

If this is fixed size, use std::array.
Add a comment explaining what this is mapping from and to.

[lanwei, 2016/05/19 16:04:12]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(SyntheticGestureController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_CONTROLLER_H_