SkRect to gfx::Rect type conversions.

ui/gfx/skia_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 "ui/gfx/skia_util.h"
 
 #include "base/i18n/char_iterator.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkLayerDrawLooper.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/rect_f.h"
 #include "ui/gfx/shadow_value.h"
 
 namespace gfx {
 
 SkRect RectToSkRect(const gfx::Rect& rect) {
-  SkRect r;
-  r.iset(rect.x(), rect.y(), rect.right(), rect.bottom());
-  return r;
+  return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
+SkRect RectFToSkRect(const gfx::RectF& rect) {
+  return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 SkIRect RectToSkIRect(const gfx::Rect& rect) {
   return SkIRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
-gfx::Rect SkRectToRect(const SkRect& rect) {
-  return gfx::Rect(static_cast<int>(rect.left()),
-                   static_cast<int>(rect.top()),
-                   static_cast<int>(rect.width()),
-                   static_cast<int>(rect.height()));
+gfx::Rect SkIRectToRect(const SkIRect& rect) {
+  return gfx::Rect(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
+gfx::RectF SkIRectToRectF(const SkIRect& rect) {
+  return gfx::RectF(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
+gfx::RectF SkRectToRectF(const SkRect& rect) {
+  return gfx::RectF(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 SkShader* CreateImageRepShader(const gfx::ImageSkiaRep& image_rep,
                                SkShader::TileMode tile_mode,
                                const SkMatrix& local_matrix) {
   SkShader* shader = SkShader::CreateBitmapShader(image_rep.sk_bitmap(),
       tile_mode, tile_mode);
   SkScalar scale_x = local_matrix.getScaleX();
   SkScalar scale_y = local_matrix.getScaleY();
   SkScalar bitmap_scale = SkFloatToScalar(image_rep.GetScale());
@@ skipping 139 matching lines @@
     } else {
       rgba[i + 0] = SkGetPackedR32(pixel_in);
       rgba[i + 1] = SkGetPackedG32(pixel_in);
       rgba[i + 2] = SkGetPackedB32(pixel_in);
       rgba[i + 3] = alpha;
     }
   }
 }
 
 }  // namespace gfx