Postpone rail application for touch scrolling - chrome side.

ui/events/gesture_detection/gesture_provider.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 "ui/events/gesture_detection/gesture_provider.h"
 
 #include <cmath>
 
 #include "base/auto_reset.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/event_constants.h"
+#include "ui/events/gesture_detection/gesture_detection_switches.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
 #include "ui/events/gesture_detection/gesture_listeners.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/events/gesture_detection/scale_gesture_listeners.h"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace ui {
 namespace {
 
@@ skipping 289 matching lines @@
                          e1.GetY(),
                          e1.GetRawX(),
                          e1.GetRawY(),
                          e2.GetPointerCount(),
                          GetBoundingBox(e2, scroll_details.type()),
                          e2.GetFlags()));
       DCHECK(scroll_event_sent_);
     }
 
     snap_scroll_controller_.UpdateSnapScrollMode(distance_x, distance_y);
-    if (snap_scroll_controller_.IsSnappingScrolls()) {
+
+    if (!PostponeRailApplication() &&

[jdduke (slow), 2015/04/01 17:40:49]

We've worked hard to keep globals out of the gesture detection code, this should
be an argument to the gesture detection config.

+        snap_scroll_controller_.IsSnappingScrolls()) {
       if (snap_scroll_controller_.IsSnapHorizontal())
         distance_y = 0;
       else
         distance_x = 0;
     }
 
     if (distance_x || distance_y) {
       GestureEventDetails scroll_details(
-          ET_GESTURE_SCROLL_UPDATE, -distance_x, -distance_y);
+          ET_GESTURE_SCROLL_UPDATE, -distance_x, -distance_y,
+          snap_scroll_controller_.ScrollRailState());
+
       const gfx::RectF bounding_box = GetBoundingBox(e2, scroll_details.type());
       const gfx::PointF center = bounding_box.CenterPoint();
       const gfx::PointF raw_center =
           center + gfx::Vector2dF(e2.GetRawOffsetX(), e2.GetRawOffsetY());
       Send(CreateGesture(scroll_details,
                          e2.GetId(),
                          e2.GetToolType(),
                          e2.GetEventTime(),
                          center.x(),
                          center.y(),
                          raw_center.x(),
                          raw_center.y(),
                          e2.GetPointerCount(),
                          bounding_box,
                          e2.GetFlags()));
     }
 
     return true;
   }
 
   bool OnFling(const MotionEvent& e1,
                const MotionEvent& e2,
                float velocity_x,
                float velocity_y) override {
-    if (snap_scroll_controller_.IsSnappingScrolls()) {
-      if (snap_scroll_controller_.IsSnapHorizontal()) {
-        velocity_y = 0;
-      } else {
-        velocity_x = 0;
-      }
-    }
-
     if (!velocity_x && !velocity_y)
       return true;
 
     if (!scroll_event_sent_) {
       // The native side needs a ET_GESTURE_SCROLL_BEGIN before
       // ET_SCROLL_FLING_START to send the fling to the correct target.
       // The distance traveled in one second is a reasonable scroll start hint.
       GestureEventDetails scroll_details(
           ET_GESTURE_SCROLL_BEGIN, velocity_x, velocity_y);
       Send(CreateGesture(scroll_details, e2));
     }
 
+    if (!PostponeRailApplication() &&
+        snap_scroll_controller_.IsSnappingScrolls()) {
+      if (snap_scroll_controller_.IsSnapHorizontal())
+        velocity_y = 0;
+      else
+        velocity_x = 0;
+    }
+
     GestureEventDetails fling_details(
-        ET_SCROLL_FLING_START, velocity_x, velocity_y);
+        ET_SCROLL_FLING_START, velocity_x, velocity_y,
+        snap_scroll_controller_.ScrollRailState());
     Send(CreateGesture(fling_details, e2));
     return true;
   }
 
   bool OnSwipe(const MotionEvent& e1,
                const MotionEvent& e2,
                float velocity_x,
                float velocity_y) override {
     GestureEventDetails swipe_details(ET_GESTURE_SWIPE, velocity_x, velocity_y);
     Send(CreateGesture(swipe_details, e2));
@@ skipping 436 matching lines @@
   // null'ing of the listener until the sequence has ended.
   if (current_down_event_)
     return;
 
   const bool double_tap_enabled =
       double_tap_support_for_page_ && double_tap_support_for_platform_;
   gesture_listener_->SetDoubleTapEnabled(double_tap_enabled);
 }
 
 }  //  namespace ui