| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_ | 5 #ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_ | 
| 6 #define UI_GFX_INTERPOLATED_TRANSFORM_H_ | 6 #define UI_GFX_INTERPOLATED_TRANSFORM_H_ | 
| 7 | 7 | 
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "ui/gfx/point.h" | 10 #include "ui/gfx/geometry/point.h" | 
| 11 #include "ui/gfx/point3_f.h" | 11 #include "ui/gfx/geometry/point3_f.h" | 
| 12 #include "ui/gfx/transform.h" | 12 #include "ui/gfx/transform.h" | 
| 13 #include "ui/gfx/transform_util.h" | 13 #include "ui/gfx/transform_util.h" | 
| 14 #include "ui/gfx/vector3d_f.h" | 14 #include "ui/gfx/vector3d_f.h" | 
| 15 | 15 | 
| 16 namespace ui { | 16 namespace ui { | 
| 17 | 17 | 
| 18 /////////////////////////////////////////////////////////////////////////////// | 18 /////////////////////////////////////////////////////////////////////////////// | 
| 19 // class InterpolatedTransform | 19 // class InterpolatedTransform | 
| 20 // | 20 // | 
| 21 // Abstract base class for transforms that animate over time. These | 21 // Abstract base class for transforms that animate over time. These | 
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 256   void Init(const gfx::Transform& start_transform, | 256   void Init(const gfx::Transform& start_transform, | 
| 257             const gfx::Transform& end_transform); | 257             const gfx::Transform& end_transform); | 
| 258 | 258 | 
| 259   gfx::DecomposedTransform start_decomp_; | 259   gfx::DecomposedTransform start_decomp_; | 
| 260   gfx::DecomposedTransform end_decomp_; | 260   gfx::DecomposedTransform end_decomp_; | 
| 261 }; | 261 }; | 
| 262 | 262 | 
| 263 } // namespace ui | 263 } // namespace ui | 
| 264 | 264 | 
| 265 #endif  // UI_GFX_INTERPOLATED_TRANSFORM_H_ | 265 #endif  // UI_GFX_INTERPOLATED_TRANSFORM_H_ | 
| OLD | NEW | 
|---|