Index: ui/gfx/interpolated_transform.h |
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h |
index a22a0e774e51d57bb09f46d2b00f56f121daa3dc..3e0c6456641a610b8332a5af499781f8cd144391 100644 |
--- a/ui/gfx/interpolated_transform.h |
+++ b/ui/gfx/interpolated_transform.h |
@@ -42,7 +42,7 @@ class GFX_EXPORT InterpolatedTransform { |
// and our child's transform at time t (if we have one). |
// |
// This function takes ownership of the passed InterpolatedTransform. |
- void SetChild(InterpolatedTransform* child); |
+ void SetChild(std::unique_ptr<InterpolatedTransform> child); |
// If the interpolated transform is reversed, Interpolate(t) will return |
// Interpolate(1 - t) |
@@ -223,21 +223,24 @@ class GFX_EXPORT InterpolatedTransformAboutPivot |
: public InterpolatedTransform { |
public: |
// Takes ownership of the passed transform. |
- InterpolatedTransformAboutPivot(const gfx::Point& pivot, |
- InterpolatedTransform* transform); |
+ InterpolatedTransformAboutPivot( |
+ const gfx::Point& pivot, |
+ std::unique_ptr<InterpolatedTransform> transform); |
// Takes ownership of the passed transform. |
- InterpolatedTransformAboutPivot(const gfx::Point& pivot, |
- InterpolatedTransform* transform, |
- float start_time, |
- float end_time); |
+ InterpolatedTransformAboutPivot( |
+ const gfx::Point& pivot, |
+ std::unique_ptr<InterpolatedTransform> transform, |
+ float start_time, |
+ float end_time); |
~InterpolatedTransformAboutPivot() override; |
protected: |
gfx::Transform InterpolateButDoNotCompose(float t) const override; |
private: |
- void Init(const gfx::Point& pivot, InterpolatedTransform* transform); |
+ void Init(const gfx::Point& pivot, |
+ std::unique_ptr<InterpolatedTransform> transform); |
std::unique_ptr<InterpolatedTransform> transform_; |