gfx::Transform API clean-up

ui/gfx/interpolated_transform.h

 // 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.
 
 #ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_
 #define UI_GFX_INTERPOLATED_TRANSFORM_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/transform.h"
+#include "ui/gfx/transform_util.h"
+#include "ui/gfx/vector3d_f.h"
 
 namespace ui {
 
 ///////////////////////////////////////////////////////////////////////////////
 // class InterpolatedTransform
 //
 // Abstract base class for transforms that animate over time. These
 // interpolated transforms can be combined to allow for more sophisticated
 // animations. For example, you might combine a rotation of 90 degrees between
 // times 0 and 1, with a scale from 1 to 0.3 between times 0 and 0.25 and a
@@ skipping 16 matching lines @@
   // and our child's transform at time t (if we have one).
   //
   // This function takes ownership of the passed InterpolatedTransform.
   void SetChild(InterpolatedTransform* child);
 
   // If the interpolated transform is reversed, Interpolate(t) will return
   // Interpolate(1 - t)
   void SetReversed(bool reversed) { reversed_ = reversed; }
   bool Reversed() const { return reversed_; }
 
-  // NOTE: this function is soon to be deprecated.
-  static bool FactorTRS(const gfx::Transform& transform,
-                        gfx::Point* translation,
-                        float* rotation,
-                        gfx::Point3F* scale);
-
  protected:
   // Calculates the interpolated transform without considering our child.
   virtual gfx::Transform InterpolateButDoNotCompose(float t) const = 0;
 
   // If time in (start_time_, end_time_], this function linearly interpolates
   // between start_value and end_value.  More precisely it returns
   // (1 - t) * start_value + t * end_value where
   // t = (start_time_ - time) / (end_time_ - start_time_).
   // If time < start_time_ it returns start_value, and if time >= end_time_
   // it returns end_value.
@@ skipping 43 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // class InterpolatedAxisAngleRotation
 //
 // Represents an animated rotation.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class UI_EXPORT InterpolatedAxisAngleRotation : public InterpolatedTransform {
  public:
-  InterpolatedAxisAngleRotation(gfx::Point3F axis,
+  InterpolatedAxisAngleRotation(gfx::Vector3dF axis,

[danakj, 2012/11/16 19:46:12]

const& to match ui/gfx style.

                                 float start_degrees,
                                 float end_degrees);
-  InterpolatedAxisAngleRotation(gfx::Point3F axis,
+  InterpolatedAxisAngleRotation(gfx::Vector3dF axis,

[danakj, 2012/11/16 19:46:12]

const&

                                 float start_degrees,
                                 float end_degrees,
                                 float start_time,
                                 float end_time);
   virtual ~InterpolatedAxisAngleRotation();
 
  protected:
   virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
 
  private:
-  gfx::Point3F axis_;
+  gfx::Vector3dF axis_;
   const float start_degrees_;
   const float end_degrees_;
 
   DISALLOW_COPY_AND_ASSIGN(InterpolatedAxisAngleRotation);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // class InterpolatedScale
 //
 // Represents an animated scale.
@@ skipping 90 matching lines @@
   virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
 
  private:
   void Init(const gfx::Point& pivot, InterpolatedTransform* transform);
 
   scoped_ptr<InterpolatedTransform> transform_;
 
   DISALLOW_COPY_AND_ASSIGN(InterpolatedTransformAboutPivot);
 };
 
-class UI_EXPORT InterpolatedTRSTransform : public InterpolatedTransform {
+class UI_EXPORT InterpolatedMatrixTransform : public InterpolatedTransform {
  public:
-  InterpolatedTRSTransform(const gfx::Transform& start_transform,
-                           const gfx::Transform& end_transform);
+  InterpolatedMatrixTransform(const gfx::Transform& start_transform,
+                              const gfx::Transform& end_transform);
 
-  InterpolatedTRSTransform(const gfx::Transform& start_transform,
-                           const gfx::Transform& end_transform,
-                           float start_time,
-                           float end_time);
+  InterpolatedMatrixTransform(const gfx::Transform& start_transform,
+                              const gfx::Transform& end_transform,
+                              float start_time,
+                              float end_time);
 
-  virtual ~InterpolatedTRSTransform();
+  virtual ~InterpolatedMatrixTransform();
 
  protected:
   virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
 
  private:
   void Init(const gfx::Transform& start_transform,
             const gfx::Transform& end_transform);
 
-  scoped_ptr<InterpolatedTransform> transform_;
+  gfx::DecomposedTransform start_decomp_;
+  gfx::DecomposedTransform end_decomp_;
 };
 
 } // namespace ui
 
 #endif  // UI_GFX_INTERPOLATED_TRANSFORM_H_