ui: Remove implicit flooring in skia rect conversion methods.

ui/gfx/rect_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
@@ skipping 376 matching lines @@
   Rect just_below_no_edge(2, 8, 3, 2);  // too narrow
   Rect just_left_no_edge(0, 3, 2, 6);   // too tall
   Rect just_right_no_edge(6, 3, 2, 4);  // too short
 
   EXPECT_FALSE(r.SharesEdgeWith(just_above_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_below_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_left_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_right_no_edge));
 }
 
-TEST(RectTest, SkRectToRect) {
-  Rect src(10, 20, 30, 40);
-  SkRect skrect = RectToSkRect(src);
-  EXPECT_EQ(src, SkRectToRect(skrect));
+TEST(RectTest, SkiaRectConversions) {
+  Rect isrc(10, 20, 30, 40);
+  RectF fsrc(10.5f, 20.5f, 30.5f, 40.5f);
+
+  SkIRect skirect = RectToSkIRect(isrc);
+  EXPECT_EQ(isrc.ToString(), SkIRectToRect(skirect).ToString());
+
+  SkRect skrect = RectToSkRect(isrc);
+  EXPECT_EQ(gfx::RectF(isrc).ToString(), SkRectToRectF(skrect).ToString());
+
+  skrect = RectFToSkRect(fsrc);
+  EXPECT_EQ(fsrc.ToString(), SkRectToRectF(skrect).ToString());
 }
 
 // Similar to EXPECT_FLOAT_EQ, but lets NaN equal NaN
 #define EXPECT_FLOAT_AND_NAN_EQ(a, b) \
   { if (a == a || b == b) { EXPECT_FLOAT_EQ(a, b); } }
 
 TEST(RectTest, ScaleRect) {
   static const struct Test {
     int x1;  // source
     int y1;
@@ skipping 304 matching lines @@
             (Vector2dF(1.1f, -1.1f) + f).ToString());
   f += Vector2dF(1.1f, -1.1f);
   EXPECT_EQ(RectF(2.2f, 1.1f, 3.3f, 4.4f).ToString(), f.ToString());
   EXPECT_EQ(RectF(1.1f, 2.2f, 3.3f, 4.4f).ToString(),
             (f - Vector2dF(1.1f, -1.1f)).ToString());
   f -= Vector2dF(1.1f, -1.1f);
   EXPECT_EQ(RectF(1.1f, 2.2f, 3.3f, 4.4f).ToString(), f.ToString());
 }
 
 }  // namespace gfx