[exp] Browser-side fling in aura.

content/common/input/web_input_event_traits.cc

Index: content/common/input/web_input_event_traits.cc
diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc
index fa9f433a1d7fd538a6e1cd23ce6e0424e98f6cd9..22ac188a481acc262b189bea938163db0e9004cd 100644
--- a/content/common/input/web_input_event_traits.cc
+++ b/content/common/input/web_input_event_traits.cc
@@ -152,7 +152,8 @@ bool CanCoalesce(const WebGestureEvent& event_to_coalesce,
       event.modifiers != event_to_coalesce.modifiers)
     return false;
 
-  if (event.type == WebInputEvent::GestureScrollUpdate)
+  if (event.type == WebInputEvent::GestureScrollUpdate ||
+      event.type == WebInputEvent::GestureScrollUpdateWithoutPropagation)
     return true;
 
   // GesturePinchUpdate scales can be combined only if they share a focal point,
@@ -168,7 +169,8 @@ bool CanCoalesce(const WebGestureEvent& event_to_coalesce,
 void Coalesce(const WebGestureEvent& event_to_coalesce,
               WebGestureEvent* event) {
   DCHECK(CanCoalesce(event_to_coalesce, *event));
-  if (event->type == WebInputEvent::GestureScrollUpdate) {
+  if (event->type == WebInputEvent::GestureScrollUpdate ||
+      event->type == WebInputEvent::GestureScrollUpdateWithoutPropagation) {
     event->data.scrollUpdate.deltaX +=
         event_to_coalesce.data.scrollUpdate.deltaX;
     event->data.scrollUpdate.deltaY +=
@@ -277,6 +279,7 @@ const char* WebInputEventTraits::GetName(WebInputEvent::Type type) {
     CASE_TYPE(GestureScrollBegin);
     CASE_TYPE(GestureScrollEnd);
     CASE_TYPE(GestureScrollUpdate);
+    CASE_TYPE(GestureScrollUpdateWithoutPropagation);
     CASE_TYPE(GestureFlingStart);
     CASE_TYPE(GestureFlingCancel);
     CASE_TYPE(GestureShowPress);