Type conversion fixes, ui/gfx/ edition.

ui/gfx/transform.cc

Index: ui/gfx/transform.cc
diff --git a/ui/gfx/transform.cc b/ui/gfx/transform.cc
index 7fe5174e750444225b748a34a67bb61fdea19c82..e9b029d809deaaccd515fe2b221934535561e003 100644
--- a/ui/gfx/transform.cc
+++ b/ui/gfx/transform.cc
@@ -153,13 +153,13 @@ void Transform::RotateAbout(const Vector3dF& axis, double degrees) {
     matrix_.setRotateDegreesAbout(SkFloatToMScalar(axis.x()),
                                   SkFloatToMScalar(axis.y()),
                                   SkFloatToMScalar(axis.z()),
-                                  degrees);
+                                  SkDoubleToMScalar(degrees));
   } else {
     SkMatrix44 rot(SkMatrix44::kUninitialized_Constructor);
     rot.setRotateDegreesAbout(SkFloatToMScalar(axis.x()),
                               SkFloatToMScalar(axis.y()),
                               SkFloatToMScalar(axis.z()),
-                              degrees);
+                              SkDoubleToMScalar(degrees));
     matrix_.preConcat(rot);
   }
 }
@@ -179,9 +179,9 @@ void Transform::Translate3d(SkMScalar x, SkMScalar y, SkMScalar z) {
 }
 
 void Transform::SkewX(double angle_x) {
-  if (matrix_.isIdentity())
+  if (matrix_.isIdentity()) {
     matrix_.set(0, 1, TanDegrees(angle_x));
-  else {
+  } else {
     SkMatrix44 skew(SkMatrix44::kIdentity_Constructor);
     skew.set(0, 1, TanDegrees(angle_x));
     matrix_.preConcat(skew);
@@ -189,9 +189,9 @@ void Transform::SkewX(double angle_x) {
 }
 
 void Transform::SkewY(double angle_y) {
-  if (matrix_.isIdentity())
+  if (matrix_.isIdentity()) {
     matrix_.set(1, 0, TanDegrees(angle_y));
-  else {
+  } else {
     SkMatrix44 skew(SkMatrix44::kIdentity_Constructor);
     skew.set(1, 0, TanDegrees(angle_y));
     matrix_.preConcat(skew);
@@ -201,11 +201,11 @@ void Transform::SkewY(double angle_y) {
 void Transform::ApplyPerspectiveDepth(SkMScalar depth) {
   if (depth == 0)
     return;
-  if (matrix_.isIdentity())
-    matrix_.set(3, 2, -1.0 / depth);
-  else {
+  if (matrix_.isIdentity()) {
+    matrix_.set(3, 2, -SK_MScalar1 / depth);
+  } else {
     SkMatrix44 m(SkMatrix44::kIdentity_Constructor);
-    m.set(3, 2, -1.0 / depth);
+    m.set(3, 2, -SK_MScalar1 / depth);
     matrix_.preConcat(m);
   }
 }
@@ -516,8 +516,10 @@ void Transform::TransformPointInternal(const SkMatrix44& xform,
   if (xform.isIdentity())
     return;
 
-  SkMScalar p[4] = {SkFloatToMScalar(point->x()), SkFloatToMScalar(point->y()),
-                    0, 1};
+  // TODO(danakj): When https://code.google.com/p/skia/issues/detail?id=3045 is

[danakj, 2014/10/23 15:35:44]

Can use SkIntToMScalar now?

+  // fixed, use those conversions.
+  SkMScalar p[4] = {SkScalarToMScalar(SkIntToScalar(point->x())),
+                    SkScalarToMScalar(SkIntToScalar(point->y())), 0, 1};
 
   xform.mapMScalars(p);