| Index: ui/compositor/layer_animation_element.h
|
| diff --git a/ui/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h
|
| index aaeb51c2344f40bfc9c465155cdd34a8448aba2f..f847e42b8d3ba4816774d0d0f961fc12259aca50 100644
|
| --- a/ui/compositor/layer_animation_element.h
|
| +++ b/ui/compositor/layer_animation_element.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/macros.h"
|
| @@ -70,7 +71,7 @@ class COMPOSITOR_EXPORT LayerAnimationElement {
|
|
|
| // Creates an element that transitions to the given transform. The caller owns
|
| // the return value.
|
| - static LayerAnimationElement* CreateTransformElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateTransformElement(
|
| const gfx::Transform& transform,
|
| base::TimeDelta duration);
|
|
|
| @@ -81,49 +82,50 @@ class COMPOSITOR_EXPORT LayerAnimationElement {
|
| // transform and the last value the interpolated transform will assume. It is
|
| // therefore important that the value of the interpolated at time 0 matches
|
| // the current transform.
|
| - static LayerAnimationElement* CreateInterpolatedTransformElement(
|
| - InterpolatedTransform* interpolated_transform,
|
| + static std::unique_ptr<LayerAnimationElement>
|
| + CreateInterpolatedTransformElement(
|
| + std::unique_ptr<InterpolatedTransform> interpolated_transform,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that transitions to the given bounds. The caller owns
|
| // the return value.
|
| - static LayerAnimationElement* CreateBoundsElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateBoundsElement(
|
| const gfx::Rect& bounds,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that transitions to the given opacity. The caller owns
|
| // the return value.
|
| - static LayerAnimationElement* CreateOpacityElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateOpacityElement(
|
| float opacity,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that sets visibily following a delay. The caller owns
|
| // the return value.
|
| - static LayerAnimationElement* CreateVisibilityElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateVisibilityElement(
|
| bool visibility,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that transitions to the given brightness.
|
| // The caller owns the return value.
|
| - static LayerAnimationElement* CreateBrightnessElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateBrightnessElement(
|
| float brightness,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that transitions to the given grayscale value.
|
| // The caller owns the return value.
|
| - static LayerAnimationElement* CreateGrayscaleElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateGrayscaleElement(
|
| float grayscale,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that pauses the given properties. The caller owns the
|
| // return value.
|
| - static LayerAnimationElement* CreatePauseElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreatePauseElement(
|
| AnimatableProperties properties,
|
| base::TimeDelta duration);
|
|
|
| // Creates an element that transitions to the given color. The caller owns the
|
| // return value.
|
| - static LayerAnimationElement* CreateColorElement(
|
| + static std::unique_ptr<LayerAnimationElement> CreateColorElement(
|
| SkColor color,
|
| base::TimeDelta duration);
|
|
|
|
|