Refactor access to scroll deltas in GesturePoint

ui/base/gestures/gesture_sequence.cc

 // Copyright (c) 2012 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/base/gestures/gesture_sequence.h"
 
 #include <cmath>
 #include <stdlib.h>
 
 #include "base/logging.h"
@@ skipping 715 matching lines @@
         GestureEventDetails(ui::ET_GESTURE_SCROLL_END, 0, 0),
         location,
         flags_,
         base::Time::FromDoubleT(point.last_touch_time()),
         1 << point.touch_id()));
   }
 }
 
 void GestureSequence::AppendScrollGestureUpdate(GesturePoint& point,
                                                 Gestures* gestures) {
-  float dx, dy;
+  gfx::Vector2d d;
   gfx::Point location;
   if (point_count_ == 1) {
-    dx = point.x_delta();
-    dy = point.y_delta();
+    d = point.ScrollDelta();
     location = point.last_touch_position();
   } else {
     location = bounding_box_.CenterPoint();
-    dx = location.x() - latest_multi_scroll_update_location_.x();
-    dy = location.y() - latest_multi_scroll_update_location_.y();
+    d = location - latest_multi_scroll_update_location_;
     latest_multi_scroll_update_location_ = location;
   }
   if (scroll_type_ == ST_HORIZONTAL)
-    dy = 0;
+    d.set_y(0);
   else if (scroll_type_ == ST_VERTICAL)
-    dx = 0;
-  if (dx == 0 && dy == 0)
+    d.set_x(0);
+  if (d == gfx::Vector2d())

[sadrul, 2012/12/04 21:27:44]

d.IsZero()?

[rjkroege, 2012/12/04 21:53:34]

Done.

     return;
 
-  GestureEventDetails details(ui::ET_GESTURE_SCROLL_UPDATE, dx, dy);
+  GestureEventDetails details(ui::ET_GESTURE_SCROLL_UPDATE, d.x(), d.y());
   details.SetScrollVelocity(
       scroll_type_ == ST_VERTICAL ? 0 : point.XVelocity(),
       scroll_type_ == ST_HORIZONTAL ? 0 : point.YVelocity());
   gestures->push_back(CreateGestureEvent(
       details,
       location,
       flags_,
       base::Time::FromDoubleT(point.last_touch_time()),
       ComputeTouchBitmask(points_)));
 }
@@ skipping 359 matching lines @@
     return;
 
   // Since long press timer has been started, there should be a non-NULL point.
   const GesturePoint* point = GetPointByPointId(0);
   if (!ui::gestures::IsInsideManhattanSquare(point->first_touch_position(),
       event.location()))
     GetLongPressTimer()->Stop();
 }
 
 }  // namespace ui