Touch emulator: allow multiple touch streams.

content/browser/renderer_host/render_widget_host_impl.h

Index: content/browser/renderer_host/render_widget_host_impl.h
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index f72ce430667c4c18358be0d37b4ca18413f7545a..2d72db1ab5e0f733db3f7f108be06f65f73fdaba 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -30,6 +30,7 @@
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/touch_emulator_client.h"
+#include "content/browser/renderer_host/input/touch_stream_tracker.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/common/input/synthetic_gesture_packet.h"
 #include "content/common/view_message_enums.h"
@@ -296,10 +297,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl
       const blink::WebMouseWheelEvent& wheel_event,
       const ui::LatencyInfo& ui_latency);
 
-  // TouchEmulatorClient overrides.
+  // TouchEmulatorClient implementation.
   virtual void ForwardGestureEvent(
       const blink::WebGestureEvent& gesture_event) OVERRIDE;
-  virtual void ForwardTouchEvent(
+  virtual void ForwardEmulatedTouchEvent(
       const blink::WebTouchEvent& touch_event) OVERRIDE;
   virtual void SetCursor(const WebCursor& cursor) OVERRIDE;
 
@@ -696,6 +697,15 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   void OnSyntheticGestureCompleted(SyntheticGesture::Result result);
 
+  void ForwardTouchEventWithLatencyInfoFromStream(
+      const blink::WebTouchEvent& touch_event,
+      const ui::LatencyInfo& ui_latency,
+      TouchStreamTracker::TouchStream stream);
+  void OnTouchEventAckFromStream(
+      const TouchEventWithLatencyInfo& event,
+      InputEventAckState ack_result,
+      TouchStreamTracker::TouchStream stream);
+
   // Called when there is a new auto resize (using a post to avoid a stack
   // which may get in recursive loops).
   void DelayedAutoResized();
@@ -868,6 +878,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   scoped_ptr<TouchEmulator> touch_emulator_;
 
+  scoped_ptr<TouchStreamTracker> touch_stream_tracker_;
+
   // Receives and handles all input events.
   scoped_ptr<InputRouter> input_router_;