SkRect to gfx::Rect type conversions.

ui/gfx/transform.cc

Index: ui/gfx/transform.cc
diff --git a/ui/gfx/transform.cc b/ui/gfx/transform.cc
index d34c9076f1d5d19a9403725fe059d444f55b1205..6c38ed4cd798581c96aeea484ec5e27aef697fbb 100644
--- a/ui/gfx/transform.cc
+++ b/ui/gfx/transform.cc
@@ -6,6 +6,7 @@
 
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/safe_integer_conversions.h"
 #include "ui/gfx/skia_util.h"
 
@@ -155,7 +156,7 @@ void Transform::TransformRect(Rect* rect) const {
   SkRect src = RectToSkRect(*rect);
   const SkMatrix& matrix = matrix_;
   matrix.mapRect(&src);
-  *rect = SkRectToRect(src);
+  *rect = gfx::ToFlooredRectDeprecated(SkRectToRectF(src));

[sky, 2012/11/01 16:10:24]

The plan was to remove ToFlooredRectDeprecated. If we really need the function
it should not be deprecated.

[danakj, 2012/11/01 16:38:21]

IMO it's more a matter of making existing code that does this operation
implicitly into explicit calls to this function. Then we can see where we need
to evaluate and probably fix with a call to enclosed/enclosing, or whatnot.

[danakj, 2012/11/01 17:38:27]

I guess these methods need to take a RectF then, and each transform callsite
needs to decide enclosed/enclosing/use float. Sorry for making you undo that
first.

 }
 
 bool Transform::TransformRectReverse(Rect* rect) const {
@@ -165,7 +166,7 @@ bool Transform::TransformRectReverse(Rect* rect) const {
   const SkMatrix& matrix = inverse;
   SkRect src = RectToSkRect(*rect);
   matrix.mapRect(&src);
-  *rect = SkRectToRect(src);
+  *rect = gfx::ToFlooredRectDeprecated(SkRectToRectF(src));
   return true;
 }