Revert of Consolidate all touch/gesture related constants in content

content/browser/renderer_host/input/gesture_event_queue.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/gesture_event_queue.h"
 
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
 #include "content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h"
 #include "content/public/common/content_switches.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 
 namespace content {
+namespace {
 
-GestureEventQueue::Config::Config() {
-}
+// Default debouncing interval duration: if a scroll is in progress, non-scroll
+// events during this interval are deferred to either its end or discarded on
+// receipt of another GestureScrollUpdate.
+static const int kDebouncingIntervalTimeMs = 30;
+
+}  // namespace
 
 GestureEventQueue::GestureEventQueue(
     GestureEventQueueClient* client,
-    TouchpadTapSuppressionControllerClient* touchpad_client,
-    const Config& config)
-    : client_(client),
-      fling_in_progress_(false),
-      scrolling_in_progress_(false),
-      ignore_next_ack_(false),
-      touchpad_tap_suppression_controller_(
-          touchpad_client, config.touchpad_tap_suppression_config),
-      touchscreen_tap_suppression_controller_(
-          this, config.touchscreen_tap_suppression_config),
-      debounce_interval_(config.debounce_interval) {
+    TouchpadTapSuppressionControllerClient* touchpad_client)
+     : client_(client),
+       fling_in_progress_(false),
+       scrolling_in_progress_(false),
+       ignore_next_ack_(false),
+       touchpad_tap_suppression_controller_(
+           new TouchpadTapSuppressionController(touchpad_client)),
+       touchscreen_tap_suppression_controller_(
+           new TouchscreenTapSuppressionController(this)),
+       debounce_interval_time_ms_(kDebouncingIntervalTimeMs),
+       debounce_enabled_(true) {
   DCHECK(client);
-  DCHECK(touchpad_client);
+  DCHECK(touchpad_tap_suppression_controller_);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableGestureDebounce)) {
+    debounce_enabled_ = false;
+  }
 }
 
 GestureEventQueue::~GestureEventQueue() { }
 
 bool GestureEventQueue::ShouldDiscardFlingCancelEvent(
     const GestureEventWithLatencyInfo& gesture_event) const {
   if (coalesced_gesture_events_.empty() && fling_in_progress_)
     return false;
   GestureQueue::const_reverse_iterator it =
       coalesced_gesture_events_.rbegin();
   while (it != coalesced_gesture_events_.rend()) {
     if (it->event.type == WebInputEvent::GestureFlingStart)
       return false;
     if (it->event.type == WebInputEvent::GestureFlingCancel)
       return true;
     it++;
   }
   return true;
 }
 
 bool GestureEventQueue::ShouldForwardForBounceReduction(
     const GestureEventWithLatencyInfo& gesture_event) {
-  if (debounce_interval_ <= base::TimeDelta())
+  if (!debounce_enabled_)
     return true;
   switch (gesture_event.event.type) {
     case WebInputEvent::GestureScrollUpdate:
       if (!scrolling_in_progress_) {
         debounce_deferring_timer_.Start(
             FROM_HERE,
-            debounce_interval_,
+            base::TimeDelta::FromMilliseconds(debounce_interval_time_ms_),
             this,
             &GestureEventQueue::SendScrollEndingEventsNow);
       } else {
         // Extend the bounce interval.
         debounce_deferring_timer_.Reset();
       }
       scrolling_in_progress_ = true;
       debouncing_deferral_queue_.clear();
       return true;
     case WebInputEvent::GesturePinchBegin:
@@ skipping 33 matching lines @@
     const GestureEventWithLatencyInfo& gesture_event) const {
   return gesture_event.event.type != WebInputEvent::GestureFlingCancel ||
       !ShouldDiscardFlingCancelEvent(gesture_event);
 }
 
 bool GestureEventQueue::ShouldForwardForTapSuppression(
     const GestureEventWithLatencyInfo& gesture_event) {
   switch (gesture_event.event.type) {
     case WebInputEvent::GestureFlingCancel:
       if (gesture_event.event.sourceDevice == WebGestureEvent::Touchscreen)
-        touchscreen_tap_suppression_controller_.GestureFlingCancel();
+        touchscreen_tap_suppression_controller_->GestureFlingCancel();
       else
-        touchpad_tap_suppression_controller_.GestureFlingCancel();
+        touchpad_tap_suppression_controller_->GestureFlingCancel();
       return true;
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureShowPress:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureDoubleTap:
       if (gesture_event.event.sourceDevice == WebGestureEvent::Touchscreen) {
-        return !touchscreen_tap_suppression_controller_.FilterTapEvent(
-            gesture_event);
+        return !touchscreen_tap_suppression_controller_->
+            FilterTapEvent(gesture_event);
       }
       return true;
     default:
       return true;
   }
 }
 
 bool GestureEventQueue::ShouldForwardForCoalescing(
     const GestureEventWithLatencyInfo& gesture_event) {
   switch (gesture_event.event.type) {
@@ skipping 40 matching lines @@
   event_with_latency.latency.AddNewLatencyFrom(latency);
 
   // Ack'ing an event may enqueue additional gesture events.  By ack'ing the
   // event before the forwarding of queued events below, such additional events
   // can be coalesced with existing queued events prior to dispatch.
   client_->OnGestureEventAck(event_with_latency, ack_result);
 
   const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
   if (type == WebInputEvent::GestureFlingCancel) {
     if (event_with_latency.event.sourceDevice == WebGestureEvent::Touchscreen)
-      touchscreen_tap_suppression_controller_.GestureFlingCancelAck(processed);
+      touchscreen_tap_suppression_controller_->GestureFlingCancelAck(processed);
     else
-      touchpad_tap_suppression_controller_.GestureFlingCancelAck(processed);
+      touchpad_tap_suppression_controller_->GestureFlingCancelAck(processed);
   }
   DCHECK_LT(event_index, coalesced_gesture_events_.size());
   coalesced_gesture_events_.erase(coalesced_gesture_events_.begin() +
                                   event_index);
 
   if (ignore_next_ack_) {
     ignore_next_ack_ = false;
     return;
   }
 
@@ skipping 15 matching lines @@
     ignore_next_ack_ = true;
   }
 
   client_->SendGestureEventImmediately(first_gesture_event);
   if (second_gesture_event.event.type != WebInputEvent::Undefined)
     client_->SendGestureEventImmediately(second_gesture_event);
 }
 
 TouchpadTapSuppressionController*
     GestureEventQueue::GetTouchpadTapSuppressionController() {
-  return &touchpad_tap_suppression_controller_;
+  return touchpad_tap_suppression_controller_.get();
 }
 
 bool GestureEventQueue::ExpectingGestureAck() const {
   return !coalesced_gesture_events_.empty();
 }
 
 void GestureEventQueue::FlingHasBeenHalted() {
   fling_in_progress_ = false;
 }
 
@@ skipping 131 matching lines @@
     return 0;
 
   if (!ignore_next_ack_)
     return 1;
 
   DCHECK_GT(coalesced_gesture_events_.size(), 1U);
   return 2;
 }
 
 }  // namespace content