Re-enable passthrough touch event queue.

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 <math.h>
 
 #include <utility>
 
@@ skipping 75 matching lines @@
       select_message_pending_(false),
       move_caret_pending_(false),
       current_ack_source_(ACK_SOURCE_NONE),
       flush_requested_(false),
       active_renderer_fling_count_(0),
       touch_scroll_started_sent_(false),
       wheel_event_queue_(this,
                          base::FeatureList::IsEnabled(
                              features::kTouchpadAndWheelScrollLatching)),
       gesture_event_queue_(this, this, config.gesture_config),
-      device_scale_factor_(1.f) {
-  // TODO(dtapuska): Figure out regression caused by activating
-  // the passthrough queue. crbug.com/697871
-  if (false &&
-      base::FeatureList::IsEnabled(features::kRafAlignedTouchInputEvents)) {
+      device_scale_factor_(1.f),
+      raf_aligned_touch_enabled_(
+          base::FeatureList::IsEnabled(features::kRafAlignedTouchInputEvents)) {
+  if (raf_aligned_touch_enabled_) {
     touch_event_queue_.reset(
         new PassthroughTouchEventQueue(this, config.touch_config));
   } else {
     touch_event_queue_.reset(
         new LegacyTouchEventQueue(this, config.touch_config));
   }
 
   DCHECK(sender);
   DCHECK(client);
   DCHECK(ack_handler);
@@ skipping 262 matching lines @@
   OfferToHandlers(input_event, latency_info);
 }
 
 void InputRouterImpl::OfferToHandlers(const WebInputEvent& input_event,
                                       const ui::LatencyInfo& latency_info) {
   output_stream_validator_.Validate(input_event);
 
   if (OfferToClient(input_event, latency_info))
     return;
 
-  bool should_block = WebInputEventTraits::ShouldBlockEventStream(input_event);
+  bool should_block = WebInputEventTraits::ShouldBlockEventStream(
+      input_event, raf_aligned_touch_enabled_);
   OfferToRenderer(input_event, latency_info,
                   should_block
                       ? InputEventDispatchType::DISPATCH_TYPE_BLOCKING
                       : InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING);
 
   // Generate a synthetic ack if the event was sent so it doesn't block.
   if (!should_block) {
     ProcessInputEventAck(
         input_event.type(), INPUT_EVENT_ACK_STATE_IGNORED, latency_info,
         WebInputEventTraits::GetUniqueTouchEventId(input_event),
@@ skipping 275 matching lines @@
         DCHECK(global_touch_position_.find(touch_point->id) ==
                global_touch_position_.end());
         global_touch_position_[touch_point->id] = gfx::Point(
             touch_point->screenPosition.x, touch_point->screenPosition.y);
       }
     }
   }
 }
 
 }  // namespace content