Touch emulator: allow multiple touch streams.

content/browser/renderer_host/input/touch_emulator.cc

 // Copyright 2014 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/touch_emulator.h"
 
 #include "content/browser/renderer_host/input/motion_event_web.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "content/public/common/content_client.h"
@@ skipping 137 matching lines @@
 
   if (mouse_event.type == WebInputEvent::MouseDown)
     mouse_pressed_ = true;
   else if (mouse_event.type == WebInputEvent::MouseUp)
     mouse_pressed_ = false;
 
   UpdateShiftPressed((mouse_event.modifiers & WebInputEvent::ShiftKey) != 0);
 
   if (FillTouchEventAndPoint(mouse_event) &&
       gesture_provider_.OnTouchEvent(MotionEventWeb(touch_event_))) {
-    client_->ForwardTouchEvent(touch_event_);
+    client_->ForwardEmulatedTouchEvent(touch_event_);
   }
 
   // Do not pass mouse events to the renderer.
   return true;
 }
 
 bool TouchEmulator::HandleMouseWheelEvent(const WebMouseWheelEvent& event) {
   if (!enabled_)
     return false;
 
@@ skipping 17 matching lines @@
   if (shift_pressed_) {
     // TODO(dgozman): Add secondary touch point and set anchor.
   } else {
     // TODO(dgozman): Remove secondary touch point and anchor.
   }
 
   // Never block keyboard events.
   return false;
 }
 
-bool TouchEmulator::HandleTouchEventAck(InputEventAckState ack_result) {
+void TouchEmulator::HandleTouchEventAck(InputEventAckState ack_result) {
   const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
   gesture_provider_.OnTouchEventAck(event_consumed);
-  // TODO(dgozman): Disable emulation when real touch events are available.
-  return true;
 }
 
 void TouchEmulator::OnGestureEvent(const ui::GestureEventData& gesture) {
   WebGestureEvent gesture_event =
       CreateWebGestureEventFromGestureEventData(gesture);
 
   switch (gesture_event.type) {
     case WebInputEvent::Undefined:
       NOTREACHED() << "Undefined WebInputEvent type";
       // Bail without sending the junk event to the client.
@@ skipping 58 matching lines @@
 void TouchEmulator::CancelTouch() {
   if (!touch_active_)
     return;
 
   WebTouchEventTraits::ResetTypeAndTouchStates(
       WebInputEvent::TouchCancel,
       (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF(),
       &touch_event_);
   touch_active_ = false;
   if (gesture_provider_.OnTouchEvent(MotionEventWeb(touch_event_)))
-    client_->ForwardTouchEvent(touch_event_);
+    client_->ForwardEmulatedTouchEvent(touch_event_);
 }
 
 void TouchEmulator::UpdateCursor() {
   if (!enabled_)
     client_->SetCursor(pointer_cursor_);
   else
     client_->SetCursor(InPinchGestureMode() ? pinch_cursor_ : touch_cursor_);
 }
 
 bool TouchEmulator::UpdateShiftPressed(bool shift_pressed) {
@@ skipping 92 matching lines @@
   point.screenPosition.y = mouse_event.globalY;
 
   return true;
 }
 
 bool TouchEmulator::InPinchGestureMode() const {
   return shift_pressed_ && allow_pinch_;
 }
 
 }  // namespace content