SkRect to gfx::Rect type conversions.

ash/wm/image_grid.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/wm/image_grid.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 using std::max;
 using std::min;
 
 namespace ash {
 namespace internal {
 
 gfx::Rect ImageGrid::TestAPI::GetTransformedLayerBounds(
     const ui::Layer& layer) {
-  gfx::Rect bounds = layer.bounds();
+  gfx::RectF bounds = layer.bounds();
   layer.transform().TransformRect(&bounds);
-  return bounds;
+  return gfx::ToEnclosingRect(bounds);
 }
 
 ImageGrid::ImageGrid()
     : layer_(new ui::Layer(ui::LAYER_NOT_DRAWN)),
       top_image_height_(0),
       bottom_image_height_(0),
       left_image_width_(0),
       right_image_width_(0),
       base_top_row_height_(0),
       base_bottom_row_height_(0),
@@ skipping 237 matching lines @@
 
   painter_ptr->reset(new ImagePainter(image));
   layer_ptr->get()->set_delegate(painter_ptr->get());
   layer_ptr->get()->SetFillsBoundsOpaquely(false);
   layer_ptr->get()->SetVisible(true);
   layer_->Add(layer_ptr->get());
 }
 
 }  // namespace internal
 }  // namespace ash