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

ui/base/x/x11_util.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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 16 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "base/threading/thread.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/x/x11_util_internal.h"
+#include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_FREEBSD)
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #endif
 
 #if defined(USE_AURA)
 #include <X11/Xcursor/Xcursor.h>
@@ skipping 418 matching lines @@
     float scale = 1.f;
     if (cursor_image->width() > cursor_image->height())
       scale = kMaxPixel / cursor_image->width();
     else
       scale = kMaxPixel / cursor_image->height();
 
     scaled = skia::ImageOperations::Resize(*cursor_image,
         skia::ImageOperations::RESIZE_BETTER,
         static_cast<int>(cursor_image->width() * scale),
         static_cast<int>(cursor_image->height() * scale));
-    hotspot_point = hotspot.Scale(scale);
+    hotspot_point = gfx::ToFlooredPoint(hotspot.Scale(scale));
     needs_scale = true;
   }
 
   const SkBitmap* bitmap = needs_scale ? &scaled : cursor_image;
   XcursorImage* image = XcursorImageCreate(bitmap->width(), bitmap->height());
   image->xhot = hotspot_point.x();
   image->yhot = hotspot_point.y();
 
   if (bitmap->width() && bitmap->height()) {
     bitmap->lockPixels();
@@ skipping 1140 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui