Remove implicit flooring Scale() method from Point and Size.

ash/touch/touch_uma.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 "ash/touch/touch_uma.h"
 
 #include "ash/shell_delegate.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/events/event.h"
+#include "ui/gfx/point_conversions.h"
 
 #if defined(USE_XI2_MT)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
 
 namespace {
 
 enum GestureActionType {
   GESTURE_UNKNOWN,
@@ skipping 281 matching lines @@
       XIDeviceEvent* device_event =
           static_cast<XIDeviceEvent*>(xevent->xcookie.data);
       position.SetPoint(static_cast<int>(device_event->event_x),
                         static_cast<int>(device_event->event_y));
     } else {
       position = ui::EventLocationFromNative(event.native_event());
     }
 #else
     position = ui::EventLocationFromNative(event.native_event());
 #endif
-    position = position.Scale(1. / target->layer()->device_scale_factor());
+    position = gfx::ToFlooredPoint(
+        position.Scale(1. / target->layer()->device_scale_factor()));
   }
 
   position.set_x(std::min(bounds.width() - 1, std::max(0, position.x())));
   position.set_y(std::min(bounds.height() - 1, std::max(0, position.y())));
 
   UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionX",
       position.x() / bucket_size_x,
       0, kBucketCountForLocation, kBucketCountForLocation + 1);
   UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionY",
       position.y() / bucket_size_y,
@@ skipping 51 matching lines @@
 
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchMoveSteps", distance, 1, 1000, 50);
 
     details->last_move_time_[event.touch_id()] = event.time_stamp();
     details->last_touch_position_[event.touch_id()] = event.location();
   }
 }
 
 }  // namespace internal
 }  // namespace ash