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 256 matching lines @@
     : InterpolatedTransform(start_time, end_time),
       start_pos_(start_pos),
       end_pos_(end_pos) {
 }
 
 InterpolatedTranslation::~InterpolatedTranslation() {}
 
 gfx::Transform
 InterpolatedTranslation::InterpolateButDoNotCompose(float t) const {
   gfx::Transform result;
-  result.Translate3d(ValueBetween(t, start_pos_.x(), end_pos_.x()),
-                     ValueBetween(t, start_pos_.y(), end_pos_.y()),
-                     ValueBetween(t, start_pos_.z(), end_pos_.z()));
+  result.Translate3d(ValueBetween(t, static_cast<float>(start_pos_.x()),

[danakj, 2014/10/18 18:40:06]

isn't start_pos_ floats already?
https://code.google.com/p/chromium/codesearch#chromium/src/ui/gfx/interpolate...

[Peter Kasting, 2014/10/20 23:38:56]

Yes -- I think this got changed since the time I originally made this fix
locally.

+                                  static_cast<float>(end_pos_.x())),
+                     ValueBetween(t, static_cast<float>(start_pos_.y()),
+                                  static_cast<float>(end_pos_.y())),
+                     ValueBetween(t, static_cast<float>(start_pos_.z()),
+                                  static_cast<float>(end_pos_.z())));
   return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // InterpolatedConstantTransform
 //
 
 InterpolatedConstantTransform::InterpolatedConstantTransform(
   const gfx::Transform& transform)
     : InterpolatedTransform(),
@@ skipping 34 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());
+  to_pivot.Translate(SkScalarToMScalar(SkIntToScalar(-pivot.x())),

[danakj, 2014/10/18 18:40:06]

yo dawg, i heard you like static casts :/

we should have an SkIntToMScalar added to skia. can you file a bug and/or send
them a patch to add such a thing? and TODO here to point to the bug to use that?

also related: https://code.google.com/p/skia/issues/detail?id=3040

[Peter Kasting, 2014/10/20 23:38:56]

Filed https://code.google.com/p/skia/issues/detail?id=3045 .  Added TODO.

+                     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