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

ui/aura/root_window.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/aura/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "ui/base/events/event.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point3.h"
+#include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
 
 using std::vector;
 
 namespace aura {
 
 namespace {
 
 const int kCompositorLockTimeoutMs = 67;
 
@@ skipping 322 matching lines @@
 }
 
 void RootWindow::PostNativeEvent(const base::NativeEvent& native_event) {
 #if !defined(OS_MACOSX)
   host_->PostNativeEvent(native_event);
 #endif
 }
 
 void RootWindow::ConvertPointToNativeScreen(gfx::Point* point) const {
   // TODO(oshima): Take the root window's transform into account.
-  *point = point->Scale(ui::GetDeviceScaleFactor(layer()));
+  *point = gfx::ToFlooredPoint(point->Scale(ui::GetDeviceScaleFactor(layer())));
   gfx::Point location = host_->GetLocationOnNativeScreen();
   point->Offset(location.x(), location.y());
 }
 
 void RootWindow::ConvertPointFromNativeScreen(gfx::Point* point) const {
   gfx::Point location = host_->GetLocationOnNativeScreen();
   point->Offset(-location.x(), -location.y());
-  *point = point->Scale(1 / ui::GetDeviceScaleFactor(layer()));
+  *point = gfx::ToFlooredPoint(
+      point->Scale(1 / ui::GetDeviceScaleFactor(layer())));
 }
 
 void RootWindow::AdvanceQueuedTouchEvent(Window* window, bool processed) {
   scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
   gestures.reset(gesture_recognizer_->AdvanceTouchQueue(window, processed));
   ProcessGestures(gestures.get());
 }
 
 void RootWindow::SetGestureRecognizerForTesting(ui::GestureRecognizer* gr) {
   gesture_recognizer_.reset(gr);
@@ skipping 659 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura