NOT FOR SUBMIT - Windows Views HiDPI

ui/gfx/rect_conversions.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/gfx/rect_conversions.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "ui/gfx/safe_integer_conversions.h"
 
 namespace gfx {
 
+Rect ToSizedRect(const RectF& rect) {

[kevers, 2013/04/19 20:31:42]

This logic is identical to ToFlooredRectDeprecated, which is typically not
appropriate for non-integer scale factors.  Non-integer-scaled assets use ceiled
size. If this method is to address issues with off-by-one errors in the
dimensions of the backing store, then consider using ToFlooredPoint combined
with ToCeiledSize.  Rect has a constructor Rect(Point,Size).  Consider using it
to achieve a more compact representation of the scaling operation.

+  int min_x = ToFlooredInt(rect.origin().x());
+  int min_y = ToFlooredInt(rect.origin().y());
+  int width = ToFlooredInt(rect.size().width());
+  int height = ToFlooredInt(rect.size().height());
+  return Rect(min_x, min_y, width, height);
+}
+
 Rect ToEnclosingRect(const RectF& rect) {
   int min_x = ToFlooredInt(rect.x());
   int min_y = ToFlooredInt(rect.y());
   float max_x = rect.right();
   float max_y = rect.bottom();
   int width = std::max(ToCeiledInt(max_x) - min_x, 0);
   int height = std::max(ToCeiledInt(max_y) - min_y, 0);
   return Rect(min_x, min_y, width, height);
 }
 
@@ skipping 30 matching lines @@
 
 Rect ToFlooredRectDeprecated(const RectF& rect) {
   return Rect(ToFlooredInt(rect.x()),
               ToFlooredInt(rect.y()),
               ToFlooredInt(rect.width()),
               ToFlooredInt(rect.height()));
 }
 
 }  // namespace gfx