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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/interpolated_transform.h
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h
index a22a0e774e51d57bb09f46d2b00f56f121daa3dc..fa0f9142081a478ff6c9b2851e2d18e34a0b6a59 100644
--- a/ui/gfx/interpolated_transform.h
+++ b/ui/gfx/interpolated_transform.h
@@ -8,6 +8,7 @@
#include <memory>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/point3_f.h"
#include "ui/gfx/geometry/vector3d_f.h"
@@ -42,7 +43,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 +224,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_;

Powered by Google App Engine
This is Rietveld 408576698