Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Side by Side Diff: ui/gfx/interpolated_transform.h

Issue 2550933002: Make all LayerAnimationElement::Create*Element return unique_ptr (Closed)
Patch Set: More change and typo fix Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h"
11 #include "ui/gfx/geometry/point.h" 12 #include "ui/gfx/geometry/point.h"
12 #include "ui/gfx/geometry/point3_f.h" 13 #include "ui/gfx/geometry/point3_f.h"
13 #include "ui/gfx/geometry/vector3d_f.h" 14 #include "ui/gfx/geometry/vector3d_f.h"
14 #include "ui/gfx/transform.h" 15 #include "ui/gfx/transform.h"
15 #include "ui/gfx/transform_util.h" 16 #include "ui/gfx/transform_util.h"
16 17
17 namespace ui { 18 namespace ui {
18 19
19 /////////////////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////////////////
20 // class InterpolatedTransform 21 // class InterpolatedTransform
(...skipping 14 matching lines...) Expand all
35 InterpolatedTransform(float start_time, float end_time); 36 InterpolatedTransform(float start_time, float end_time);
36 virtual ~InterpolatedTransform(); 37 virtual ~InterpolatedTransform();
37 38
38 // Returns the interpolated transform at time t. Note: not virtual. 39 // Returns the interpolated transform at time t. Note: not virtual.
39 gfx::Transform Interpolate(float t) const; 40 gfx::Transform Interpolate(float t) const;
40 41
41 // The Intepolate ultimately returns the product of our transform at time t 42 // The Intepolate ultimately returns the product of our transform at time t
42 // and our child's transform at time t (if we have one). 43 // and our child's transform at time t (if we have one).
43 // 44 //
44 // This function takes ownership of the passed InterpolatedTransform. 45 // This function takes ownership of the passed InterpolatedTransform.
45 void SetChild(InterpolatedTransform* child); 46 void SetChild(std::unique_ptr<InterpolatedTransform> child);
46 47
47 // If the interpolated transform is reversed, Interpolate(t) will return 48 // If the interpolated transform is reversed, Interpolate(t) will return
48 // Interpolate(1 - t) 49 // Interpolate(1 - t)
49 void SetReversed(bool reversed) { reversed_ = reversed; } 50 void SetReversed(bool reversed) { reversed_ = reversed; }
50 bool Reversed() const { return reversed_; } 51 bool Reversed() const { return reversed_; }
51 52
52 protected: 53 protected:
53 // Calculates the interpolated transform without considering our child. 54 // Calculates the interpolated transform without considering our child.
54 virtual gfx::Transform InterpolateButDoNotCompose(float t) const = 0; 55 virtual gfx::Transform InterpolateButDoNotCompose(float t) const = 0;
55 56
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // 217 //
217 // Represents an animated transform with a transformed origin. Essentially, 218 // Represents an animated transform with a transformed origin. Essentially,
218 // at each time, t, the interpolated transform is created by composing 219 // at each time, t, the interpolated transform is created by composing
219 // P * T * P^-1 where P is a constant transform to the new origin. 220 // P * T * P^-1 where P is a constant transform to the new origin.
220 // 221 //
221 /////////////////////////////////////////////////////////////////////////////// 222 ///////////////////////////////////////////////////////////////////////////////
222 class GFX_EXPORT InterpolatedTransformAboutPivot 223 class GFX_EXPORT InterpolatedTransformAboutPivot
223 : public InterpolatedTransform { 224 : public InterpolatedTransform {
224 public: 225 public:
225 // Takes ownership of the passed transform. 226 // Takes ownership of the passed transform.
226 InterpolatedTransformAboutPivot(const gfx::Point& pivot, 227 InterpolatedTransformAboutPivot(
227 InterpolatedTransform* transform); 228 const gfx::Point& pivot,
229 std::unique_ptr<InterpolatedTransform> transform);
228 230
229 // Takes ownership of the passed transform. 231 // Takes ownership of the passed transform.
230 InterpolatedTransformAboutPivot(const gfx::Point& pivot, 232 InterpolatedTransformAboutPivot(
231 InterpolatedTransform* transform, 233 const gfx::Point& pivot,
232 float start_time, 234 std::unique_ptr<InterpolatedTransform> transform,
233 float end_time); 235 float start_time,
236 float end_time);
234 ~InterpolatedTransformAboutPivot() override; 237 ~InterpolatedTransformAboutPivot() override;
235 238
236 protected: 239 protected:
237 gfx::Transform InterpolateButDoNotCompose(float t) const override; 240 gfx::Transform InterpolateButDoNotCompose(float t) const override;
238 241
239 private: 242 private:
240 void Init(const gfx::Point& pivot, InterpolatedTransform* transform); 243 void Init(const gfx::Point& pivot,
244 std::unique_ptr<InterpolatedTransform> transform);
241 245
242 std::unique_ptr<InterpolatedTransform> transform_; 246 std::unique_ptr<InterpolatedTransform> transform_;
243 247
244 DISALLOW_COPY_AND_ASSIGN(InterpolatedTransformAboutPivot); 248 DISALLOW_COPY_AND_ASSIGN(InterpolatedTransformAboutPivot);
245 }; 249 };
246 250
247 class GFX_EXPORT InterpolatedMatrixTransform : public InterpolatedTransform { 251 class GFX_EXPORT InterpolatedMatrixTransform : public InterpolatedTransform {
248 public: 252 public:
249 InterpolatedMatrixTransform(const gfx::Transform& start_transform, 253 InterpolatedMatrixTransform(const gfx::Transform& start_transform,
250 const gfx::Transform& end_transform); 254 const gfx::Transform& end_transform);
(...skipping 12 matching lines...) Expand all
263 void Init(const gfx::Transform& start_transform, 267 void Init(const gfx::Transform& start_transform,
264 const gfx::Transform& end_transform); 268 const gfx::Transform& end_transform);
265 269
266 gfx::DecomposedTransform start_decomp_; 270 gfx::DecomposedTransform start_decomp_;
267 gfx::DecomposedTransform end_decomp_; 271 gfx::DecomposedTransform end_decomp_;
268 }; 272 };
269 273
270 } // namespace ui 274 } // namespace ui
271 275
272 #endif // UI_GFX_INTERPOLATED_TRANSFORM_H_ 276 #endif // UI_GFX_INTERPOLATED_TRANSFORM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698