[exp] Browser-side fling in aura.

content/browser/renderer_host/input/gesture_event_queue.cc

Index: content/browser/renderer_host/input/gesture_event_queue.cc
diff --git a/content/browser/renderer_host/input/gesture_event_queue.cc b/content/browser/renderer_host/input/gesture_event_queue.cc
index b16923be17f7234c5e4d69ceb04979253800eca9..5ed87b850a3da059bded1ad057f038406601c70a 100644
--- a/content/browser/renderer_host/input/gesture_event_queue.cc
+++ b/content/browser/renderer_host/input/gesture_event_queue.cc
@@ -143,6 +143,7 @@ bool GestureEventQueue::ShouldForwardForCoalescing(
       break;
     case WebInputEvent::GesturePinchUpdate:
     case WebInputEvent::GestureScrollUpdate:
+    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
       MergeOrInsertScrollAndPinchEvent(gesture_event);
       return ShouldHandleEventNow();
     default:
@@ -344,15 +345,19 @@ bool GestureEventQueue::ShouldTryMerging(
           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) {