[exp] Browser-side fling in aura.

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/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"
@@ skipping 125 matching lines @@
     const GestureEventWithLatencyInfo& gesture_event) {
   switch (gesture_event.event.type) {
     case WebInputEvent::GestureFlingCancel:
       fling_in_progress_ = false;
       break;
     case WebInputEvent::GestureFlingStart:
       fling_in_progress_ = true;
       break;
     case WebInputEvent::GesturePinchUpdate:
     case WebInputEvent::GestureScrollUpdate:
+    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
       MergeOrInsertScrollAndPinchEvent(gesture_event);
       return ShouldHandleEventNow();
     default:
       break;
   }
   coalesced_gesture_events_.push_back(gesture_event);
   return ShouldHandleEventNow();
 }
 
 void GestureEventQueue::ProcessGestureAck(InputEventAckState ack_result,
@@ skipping 181 matching lines @@
 }
 
 bool GestureEventQueue::ShouldTryMerging(
     const GestureEventWithLatencyInfo& new_event,
     const GestureEventWithLatencyInfo& event_in_queue) const {
   DLOG_IF(WARNING,
           new_event.event.timeStampSeconds <
           event_in_queue.event.timeStampSeconds)
           << "Event time not monotonic?\n";
   return (event_in_queue.event.type == WebInputEvent::GestureScrollUpdate ||
-      event_in_queue.event.type == WebInputEvent::GesturePinchUpdate) &&
-      event_in_queue.event.modifiers == new_event.event.modifiers &&
-      event_in_queue.event.sourceDevice == new_event.event.sourceDevice;
+          event_in_queue.event.type ==
+              WebInputEvent::GestureScrollUpdateWithoutPropagation ||
+          event_in_queue.event.type == WebInputEvent::GesturePinchUpdate) &&
+         event_in_queue.event.modifiers == new_event.event.modifiers &&
+         event_in_queue.event.sourceDevice == new_event.event.sourceDevice;
 }
 
 gfx::Transform GestureEventQueue::GetTransformForEvent(
     const GestureEventWithLatencyInfo& gesture_event) const {
   gfx::Transform gesture_transform;
-  if (gesture_event.event.type == WebInputEvent::GestureScrollUpdate) {
+  if (gesture_event.event.type == WebInputEvent::GestureScrollUpdate ||
+      gesture_event.event.type ==
+          WebInputEvent::GestureScrollUpdateWithoutPropagation) {
     gesture_transform.Translate(gesture_event.event.data.scrollUpdate.deltaX,
                                 gesture_event.event.data.scrollUpdate.deltaY);
   } else if (gesture_event.event.type == WebInputEvent::GesturePinchUpdate) {
     float scale = gesture_event.event.data.pinchUpdate.scale;
     gesture_transform.Translate(-gesture_event.event.x, -gesture_event.event.y);
     gesture_transform.Scale(scale,scale);
     gesture_transform.Translate(gesture_event.event.x, gesture_event.event.y);
   }
   return gesture_transform;
 }
 
 size_t GestureEventQueue::EventsInFlightCount() const {
   if (coalesced_gesture_events_.empty())
     return 0;
 
   if (!ignore_next_ack_)
     return 1;
 
   DCHECK_GT(coalesced_gesture_events_.size(), 1U);
   return 2;
 }
 
 }  // namespace content