Type conversion fixes, ui/gfx/ edition.

ui/gfx/interpolated_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/interpolated_transform.h"
 
 #include <cmath>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ skipping 313 matching lines @@
   if (transform_.get()) {
     return transform_->Interpolate(t);
   }
   return gfx::Transform();
 }
 
 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));
   scoped_ptr<InterpolatedTransform> post_transform(
     new InterpolatedConstantTransform(from_pivot));
 
   pre_transform->SetChild(xform);
   xform->SetChild(post_transform.release());
   transform_.reset(pre_transform.release());
 }
@@ skipping 29 matching lines @@
 
 void InterpolatedMatrixTransform::Init(const gfx::Transform& start_transform,
                                        const gfx::Transform& end_transform) {
   bool success = gfx::DecomposeTransform(&start_decomp_, start_transform);
   DCHECK(success);
   success = gfx::DecomposeTransform(&end_decomp_, end_transform);
   DCHECK(success);
 }
 
 } // namespace ui