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

content/browser/renderer_host/dip_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.
 
 #include "content/browser/renderer_host/dip_util.h"
 
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/size_conversions.h"
 
 namespace {
 
 float GetScaleForView(const content::RenderWidgetHostView* view) {
   return ui::GetScaleFactorScale(content::GetScaleFactorForView(view));
 }
 
 }  // namespace
 
 namespace content {
 
 ui::ScaleFactor GetScaleFactorForView(const RenderWidgetHostView* view) {
   return ui::GetScaleFactorForNativeView(view ? view->GetNativeView() : NULL);
 }
 
 gfx::Point ConvertPointToDIP(const RenderWidgetHostView* view,
                              const gfx::Point& point_in_pixel) {
-  return point_in_pixel.Scale(1.0f / GetScaleForView(view));
+  return gfx::ToFlooredPoint(
+      point_in_pixel.Scale(1.0f / GetScaleForView(view)));
 }
 
 gfx::Size ConvertSizeToDIP(const RenderWidgetHostView* view,
                            const gfx::Size& size_in_pixel) {
-  return size_in_pixel.Scale(1.0f / GetScaleForView(view));
+  return gfx::ToFlooredSize(
+      size_in_pixel.Scale(1.0f / GetScaleForView(view)));
 }
 
 gfx::Rect ConvertRectToDIP(const RenderWidgetHostView* view,
                            const gfx::Rect& rect_in_pixel) {
   float scale = 1.0f / GetScaleForView(view);
-  return gfx::Rect(rect_in_pixel.origin().Scale(scale),
-                   rect_in_pixel.size().Scale(scale));

[sadrul, 2012/10/08 23:05:23]

Curious why this doesn't just rect_in_pixel.Scale(scale)

[danakj, 2012/10/09 04:28:00]

Me too. It should probably be scaling and doing ToEnclosingIntRect (or
ToEnclosedIntRect) if it wants to get back to ints.

Personally I think device pixels should be in ints, but other coordinate spaces
should not be. This is going to be a bit of a mess to untangle for non-integer
device scales.

But that's all for another day/CL.

+  return gfx::Rect(gfx::ToFlooredPoint(rect_in_pixel.origin().Scale(scale)),
+                   gfx::ToFlooredSize(rect_in_pixel.size().Scale(scale)));
 }
 
 gfx::Point ConvertPointToPixel(const RenderWidgetHostView* view,
                                const gfx::Point& point_in_dip) {
-  return point_in_dip.Scale(GetScaleForView(view));
+  return gfx::ToFlooredPoint(point_in_dip.Scale(GetScaleForView(view)));
 }
 
 gfx::Size ConvertSizeToPixel(const RenderWidgetHostView* view,
                              const gfx::Size& size_in_dip) {
-  return size_in_dip.Scale(GetScaleForView(view));
+  return gfx::ToFlooredSize(size_in_dip.Scale(GetScaleForView(view)));
 }
 
 gfx::Rect ConvertRectToPixel(const RenderWidgetHostView* view,
                              const gfx::Rect& rect_in_dip) {
     float scale = GetScaleForView(view);
-    return gfx::Rect(rect_in_dip.origin().Scale(scale),
-                     rect_in_dip.size().Scale(scale));

[sadrul, 2012/10/08 23:05:23]

ditto

+    return gfx::Rect(gfx::ToFlooredPoint(rect_in_dip.origin().Scale(scale)),
+                     gfx::ToFlooredSize(rect_in_dip.size().Scale(scale)));
 }
 
 }  // namespace content