SkRect to gfx::Rect type conversions.

ui/gfx/transform.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/transform.h"
 
 #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"
 
 namespace gfx {
 
 Transform::Transform() {
   matrix_.reset();
 }
 
 Transform::~Transform() {}
@@ skipping 129 matching lines @@
     return false;
 
   TransformPointInternal(inverse, point);
   return true;
 }
 
 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 {
   SkMatrix44 inverse;
   if (!matrix_.invert(&inverse))
     return false;
   const SkMatrix& matrix = inverse;
   SkRect src = RectToSkRect(*rect);
   matrix.mapRect(&src);
-  *rect = SkRectToRect(src);
+  *rect = gfx::ToFlooredRectDeprecated(SkRectToRectF(src));
   return true;
 }
 
 void Transform::TransformPointInternal(const SkMatrix44& xform,
                                        Point3F& point) const {
   SkScalar p[4] = {
     SkFloatToScalar(point.x()),
     SkFloatToScalar(point.y()),
     SkFloatToScalar(point.z()),
     1 };
@@ skipping 11 matching lines @@
                                        Point& point) const {
   SkScalar p[4] = { SkIntToScalar(point.x()),  SkIntToScalar(point.y()),
                     0, 1 };
 
   xform.map(p);
 
   point.SetPoint(ToRoundedInt(p[0]), ToRoundedInt(p[1]));
 }
 
 }  // namespace gfx