ui: Remove implicit flooring in skia rect conversion methods.

ash/wm/image_grid_unittest.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 "ash/test/ash_test_base.h"
 #include "ash/wm/image_grid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 39 matching lines @@
   ASSERT_TRUE(grid.center_layer() != NULL);
   ASSERT_TRUE(grid.right_layer() != NULL);
   ASSERT_TRUE(grid.bottom_left_layer() != NULL);
   ASSERT_TRUE(grid.bottom_layer() != NULL);
   ASSERT_TRUE(grid.bottom_right_layer() != NULL);
 
   const gfx::Size size(20, 30);
   grid.SetSize(size);
 
   // The top-left layer should be flush with the top-left corner and unscaled.
-  EXPECT_EQ(gfx::Rect(0, 0, kBorder, kBorder).ToString(),
+  EXPECT_EQ(gfx::RectF(0, 0, kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.top_left_layer()).ToString());
 
   // The top layer should be flush with the top edge and stretched horizontally
   // between the two top corners.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 kBorder, 0, size.width() - 2 * kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.top_layer()).ToString());
 
   // The top-right layer should be flush with the top-right corner and unscaled.
-  EXPECT_EQ(gfx::Rect(size.width() - kBorder, 0, kBorder, kBorder).ToString(),
+  EXPECT_EQ(gfx::RectF(size.width() - kBorder, 0, kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.top_right_layer()).ToString());
 
   // The left layer should be flush with the left edge and stretched vertically
   // between the two left corners.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 0, kBorder, kBorder, size.height() - 2 * kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.left_layer()).ToString());
 
   // The center layer should fill the space in the middle of the grid.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 kBorder, kBorder, size.width() - 2 * kBorder,
                 size.height() - 2 * kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.center_layer()).ToString());
 
   // The right layer should be flush with the right edge and stretched
   // vertically between the two right corners.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 size.width() - kBorder, kBorder,
                 kBorder, size.height() - 2 * kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.right_layer()).ToString());
 
   // The bottom-left layer should be flush with the bottom-left corner and
   // unscaled.
-  EXPECT_EQ(gfx::Rect(0, size.height() - kBorder, kBorder, kBorder).ToString(),
+  EXPECT_EQ(gfx::RectF(0, size.height() - kBorder, kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.bottom_left_layer()).ToString());
 
   // The bottom layer should be flush with the bottom edge and stretched
   // horizontally between the two bottom corners.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 kBorder, size.height() - kBorder,
                 size.width() - 2 * kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.bottom_layer()).ToString());
 
   // The bottom-right layer should be flush with the bottom-right corner and
   // unscaled.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 size.width() - kBorder, size.height() - kBorder,
                 kBorder, kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.bottom_right_layer()).ToString());
 }
 
 // Test that an ImageGrid's layers are transformed correctly when
 // SetContentBounds() is called.
 TEST_F(ImageGridTest, SetContentBounds) {
   // Size of the images around the grid's border.
@@ skipping 10 matching lines @@
                  image_BxB.get(), image_1xB.get(), image_BxB.get());
 
   ImageGrid::TestAPI test_api(&grid);
 
   const gfx::Point origin(5, 10);
   const gfx::Size size(20, 30);
   grid.SetContentBounds(gfx::Rect(origin, size));
 
   // The master layer is positioned above the top-left corner of the content
   // bounds and has height/width that contain the grid and bounds.
-  EXPECT_EQ(gfx::Rect(origin.x() - kBorder,
+  EXPECT_EQ(gfx::RectF(origin.x() - kBorder,
                       origin.y() - kBorder,
                       size.width() + 2 * kBorder,
                       size.height() + 2 * kBorder).ToString(),
             test_api.GetTransformedLayerBounds(*grid.layer()).ToString());
 }
 
 // Check that we don't crash if only a single image is supplied.
 TEST_F(ImageGridTest, SingleImage) {
   const int kBorder = 1;
   scoped_ptr<gfx::Image> image(CreateImage(gfx::Size(kBorder, kBorder)));
@@ skipping 12 matching lines @@
   EXPECT_TRUE(grid.right_layer() == NULL);
   EXPECT_TRUE(grid.bottom_left_layer() == NULL);
   EXPECT_TRUE(grid.bottom_layer() == NULL);
   EXPECT_TRUE(grid.bottom_right_layer() == NULL);
 
   const gfx::Size kSize(10, 10);
   grid.SetSize(kSize);
 
   // The top layer should be scaled horizontally across the entire width, but it
   // shouldn't be scaled vertically.
-  EXPECT_EQ(gfx::Rect(0, 0, kSize.width(), kBorder).ToString(),
+  EXPECT_EQ(gfx::RectF(0, 0, kSize.width(), kBorder).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.top_layer()).ToString());
 }
 
 // Check that we don't crash when we reset existing images to NULL and
 // reset NULL images to new ones.
 TEST_F(ImageGridTest, ResetImages) {
   const int kBorder = 1;
   scoped_ptr<gfx::Image> image(CreateImage(gfx::Size(kBorder, kBorder)));
 
@@ skipping 49 matching lines @@
   grid.SetImages(top_left_image.get(), top_image.get(), top_right_image.get(),
                  left_image.get(), NULL, right_image.get(),
                  NULL, NULL, NULL);
   ImageGrid::TestAPI test_api(&grid);
 
   const gfx::Size kSize(20, 30);
   grid.SetSize(kSize);
 
   // The top layer should be flush with the top edge and stretched horizontally
   // between the two top corners.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 kCorner, 0, kSize.width() - 2 * kCorner, kEdge).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.top_layer()).ToString());
 
   // The left layer should be flush with the left edge and stretched vertically
   // between the top left corner and the bottom.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 0, kCorner, kEdge, kSize.height() - kCorner).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.left_layer()).ToString());
 
   // The right layer should be flush with the right edge and stretched
   // vertically between the top right corner and the bottom.
-  EXPECT_EQ(gfx::Rect(
+  EXPECT_EQ(gfx::RectF(
                 kSize.width() - kEdge, kCorner,
                 kEdge, kSize.height() - kCorner).ToString(),
             test_api.GetTransformedLayerBounds(
                 *grid.right_layer()).ToString());
 }
 
 // Test that we hide or clip layers as needed when the grid is assigned a small
 // size.
 TEST_F(ImageGridTest, TooSmall) {
   const int kCorner = 5;
@@ skipping 60 matching lines @@
 
   // We shouldn't be clipping the corner images anymore.
   EXPECT_TRUE(test_api.top_left_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.top_right_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.bottom_left_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.bottom_right_clip_rect().IsEmpty());
 }
 
 }  // namespace test
 }  // namespace ash