Move TouchEvent timeout code to the TouchEventQueue

content/browser/renderer_host/input/input_router_impl.cc

 // 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.
 
 #include "content/browser/renderer_host/input/input_router_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
+#include "base/strings/string_number_conversions.h"
 #include "content/browser/renderer_host/input/gesture_event_filter.h"
 #include "content/browser/renderer_host/input/input_ack_handler.h"
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/web_input_event_traits.h"
 #include "content/common/input_messages.h"
@@ skipping 12 matching lines @@
 using base::TimeTicks;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 
 namespace content {
 namespace {
 
+bool GetTouchAckTimeoutDelayMs(size_t* touch_ack_timeout_delay_ms) {
+  CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
+  if (!parsed_command_line->HasSwitch(switches::kTouchAckTimeoutDelayMs))
+    return false;
+
+  std::string timeout_string = parsed_command_line->GetSwitchValueASCII(
+      switches::kTouchAckTimeoutDelayMs);
+  size_t timeout_value;
+  if (!base::StringToSizeT(timeout_string, &timeout_value))
+    return false;
+
+  *touch_ack_timeout_delay_ms = timeout_value;
+  return true;
+}
+
 GestureEventWithLatencyInfo MakeGestureEvent(WebInputEvent::Type type,
                                              double timestamp_seconds,
                                              int x,
                                              int y,
                                              int modifiers,
                                              const ui::LatencyInfo latency) {
   WebGestureEvent result;
 
   result.type = type;
   result.x = x;
@@ skipping 26 matching lines @@
                                  int routing_id)
     : sender_(sender),
       client_(client),
       ack_handler_(ack_handler),
       routing_id_(routing_id),
       select_range_pending_(false),
       move_caret_pending_(false),
       mouse_move_pending_(false),
       mouse_wheel_pending_(false),
       has_touch_handler_(false),
+      touch_ack_timeout_enabled_(false),
+      touch_ack_timeout_delay_ms_(std::numeric_limits<size_t>::max()),
       current_ack_source_(ACK_SOURCE_NONE),
-      touch_event_queue_(new TouchEventQueue(this)),
       gesture_event_filter_(new GestureEventFilter(this, this)) {
   DCHECK(sender);
   DCHECK(client);
   DCHECK(ack_handler);
+  touch_event_queue_.reset(new TouchEventQueue(this));
+  touch_ack_timeout_enabled_ =
+      GetTouchAckTimeoutDelayMs(&touch_ack_timeout_delay_ms_);
+  touch_event_queue_->SetAckTimeoutEnabled(touch_ack_timeout_enabled_,
+                                           touch_ack_timeout_delay_ms_);
 }
 
 InputRouterImpl::~InputRouterImpl() {}
 
 void InputRouterImpl::Flush() {}
 
 bool InputRouterImpl::SendInput(scoped_ptr<IPC::Message> message) {
   DCHECK(IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart);
   switch (message->type()) {
     // Check for types that require an ACK.
@@ skipping 65 matching lines @@
   HISTOGRAM_COUNTS_100("Renderer.KeyboardQueueSize", key_queue_.size());
 
   gesture_event_filter_->FlingHasBeenHalted();
 
   // Only forward the non-native portions of our event.
   FilterAndSendWebInputEvent(key_event, latency_info, is_keyboard_shortcut);
 }
 
 void InputRouterImpl::SendGestureEvent(
     const GestureEventWithLatencyInfo& gesture_event) {
-  HandleGestureScroll(gesture_event);
+  touch_event_queue_->OnGestureScrollEvent(gesture_event);
 
   if (!IsInOverscrollGesture() &&
       !gesture_event_filter_->ShouldForward(gesture_event)) {
     OverscrollController* controller = client_->GetOverscrollController();
     if (controller)
       controller->DiscardingGestureEvent(gesture_event.event);
     return;
   }
 
   FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
@@ skipping 26 matching lines @@
   FilterAndSendWebInputEvent(mouse_event.event, mouse_event.latency, false);
 }
 
 void InputRouterImpl::SendTouchEventImmediately(
     const TouchEventWithLatencyInfo& touch_event) {
   FilterAndSendWebInputEvent(touch_event.event, touch_event.latency, false);
 }
 
 void InputRouterImpl::SendGestureEventImmediately(
     const GestureEventWithLatencyInfo& gesture_event) {
-  HandleGestureScroll(gesture_event);
   FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
 }
 
 const NativeWebKeyboardEvent* InputRouterImpl::GetLastKeyboardEvent() const {
   if (key_queue_.empty())
     return NULL;
   return &key_queue_.front();
 }
 
 bool InputRouterImpl::ShouldForwardTouchEvent() const {
   // Always send a touch event if the renderer has a touch-event handler. It is
   // possible that a renderer stops listening to touch-events while there are
   // still events in the touch-queue. In such cases, the new events should still
   // get into the queue.
   return has_touch_handler_ || !touch_event_queue_->empty();
 }
 
+void InputRouterImpl::OnViewUpdated(int view_flags) {
+  bool fixed_page_scale = (view_flags & FIXED_PAGE_SCALE);
+  bool mobile_viewport = (view_flags & MOBILE_VIEWPORT);
+  touch_event_queue_->SetAckTimeoutEnabled(
+      touch_ack_timeout_enabled_ && !(fixed_page_scale || mobile_viewport),
+      touch_ack_timeout_delay_ms_);
+}
+
 bool InputRouterImpl::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   bool message_is_ok = true;
   IPC_BEGIN_MESSAGE_MAP_EX(InputRouterImpl, message, message_is_ok)
     IPC_MESSAGE_HANDLER(InputHostMsg_HandleInputEvent_ACK, OnInputEventAck)
     IPC_MESSAGE_HANDLER(ViewHostMsg_MoveCaret_ACK, OnMsgMoveCaretAck)
     IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnSelectRangeAck)
     IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers,
                         OnHasTouchEventHandlers)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ skipping 335 matching lines @@
     return;
 
   OverscrollController* controller = client_->GetOverscrollController();
   if (!controller)
     return;
 
   controller->ReceivedEventACK(
       event, (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result));
 }
 
-void InputRouterImpl::HandleGestureScroll(
-    const GestureEventWithLatencyInfo& gesture_event) {
-  touch_event_queue_->OnGestureScrollEvent(gesture_event);
-}
-
 void InputRouterImpl::SimulateTouchGestureWithMouse(
     const MouseEventWithLatencyInfo& event) {
   const WebMouseEvent& mouse_event = event.event;
   int x = mouse_event.x, y = mouse_event.y;
   float dx = mouse_event.movementX, dy = mouse_event.movementY;
   static int startX = 0, startY = 0;
 
   switch (mouse_event.button) {
     case WebMouseEvent::ButtonLeft:
       if (mouse_event.type == WebInputEvent::MouseDown) {
@@ skipping 66 matching lines @@
       break;
   }
 }
 
 bool InputRouterImpl::IsInOverscrollGesture() const {
   OverscrollController* controller = client_->GetOverscrollController();
   return controller && controller->overscroll_mode() != OVERSCROLL_NONE;
 }
 
 }  // namespace content