Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: ui/gfx/transform.cc

Issue 11359172: ui: Remove implicit flooring in skia rect conversion methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make root window transform in tests produce an integer result Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/transform.h ('k') | ui/views/controls/table/table_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/transform.cc
diff --git a/ui/gfx/transform.cc b/ui/gfx/transform.cc
index d34c9076f1d5d19a9403725fe059d444f55b1205..bc214af1129fbffe1722656b7f1be43f4d0a6fe6 100644
--- a/ui/gfx/transform.cc
+++ b/ui/gfx/transform.cc
@@ -4,8 +4,9 @@
#include "ui/gfx/transform.h"
+#include "ui/gfx/point.h"
#include "ui/gfx/point3_f.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/rect_f.h"
#include "ui/gfx/safe_integer_conversions.h"
#include "ui/gfx/skia_util.h"
@@ -151,21 +152,21 @@ bool Transform::TransformPointReverse(Point3F& point) const {
return true;
}
-void Transform::TransformRect(Rect* rect) const {
- SkRect src = RectToSkRect(*rect);
+void Transform::TransformRect(RectF* rect) const {
+ SkRect src = RectFToSkRect(*rect);
const SkMatrix& matrix = matrix_;
matrix.mapRect(&src);
- *rect = SkRectToRect(src);
+ *rect = SkRectToRectF(src);
}
-bool Transform::TransformRectReverse(Rect* rect) const {
+bool Transform::TransformRectReverse(RectF* rect) const {
SkMatrix44 inverse;
if (!matrix_.invert(&inverse))
return false;
const SkMatrix& matrix = inverse;
- SkRect src = RectToSkRect(*rect);
+ SkRect src = RectFToSkRect(*rect);
matrix.mapRect(&src);
- *rect = SkRectToRect(src);
+ *rect = SkRectToRectF(src);
return true;
}
« no previous file with comments | « ui/gfx/transform.h ('k') | ui/views/controls/table/table_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698