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

Unified Diff: ui/gfx/interpolated_transform.cc

Issue 649203003: Type conversion fixes, ui/gfx/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile Created 6 years, 2 months 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
Index: ui/gfx/interpolated_transform.cc
diff --git a/ui/gfx/interpolated_transform.cc b/ui/gfx/interpolated_transform.cc
index 693b6567f7f53f01b266818001cf7d188f011f86..97f8a989e7f0a54e448475c3508f09bbd45fc19f 100644
--- a/ui/gfx/interpolated_transform.cc
+++ b/ui/gfx/interpolated_transform.cc
@@ -331,8 +331,12 @@ void InterpolatedTransformAboutPivot::Init(const gfx::Point& pivot,
InterpolatedTransform* xform) {
gfx::Transform to_pivot;
gfx::Transform from_pivot;
- to_pivot.Translate(-pivot.x(), -pivot.y());
- from_pivot.Translate(pivot.x(), pivot.y());
+ // TODO(danakj): When https://code.google.com/p/skia/issues/detail?id=3045 is
danakj 2014/10/23 15:35:44 Cool! Looks like SkIntToMScalar exists now?
+ // fixed, use those conversions.
+ to_pivot.Translate(SkScalarToMScalar(SkIntToScalar(-pivot.x())),
+ SkScalarToMScalar(SkIntToScalar(-pivot.y())));
+ from_pivot.Translate(SkScalarToMScalar(SkIntToScalar(pivot.x())),
+ SkScalarToMScalar(SkIntToScalar(pivot.y())));
scoped_ptr<InterpolatedTransform> pre_transform(
new InterpolatedConstantTransform(to_pivot));

Powered by Google App Engine
This is Rietveld 408576698