| Index: third_party/WebKit/Source/core/animation/Interpolation.h
|
| diff --git a/third_party/WebKit/Source/core/animation/Interpolation.h b/third_party/WebKit/Source/core/animation/Interpolation.h
|
| index e613163d26812ceaf4f59e822b3f5a69f10203e4..6131a9858762cd417810491535cad51e68a42610 100644
|
| --- a/third_party/WebKit/Source/core/animation/Interpolation.h
|
| +++ b/third_party/WebKit/Source/core/animation/Interpolation.h
|
| @@ -9,6 +9,7 @@
|
| #include "core/animation/InterpolableValue.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/RefCounted.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -30,14 +31,14 @@ public:
|
| virtual bool dependsOnUnderlyingValue() const { return false; }
|
|
|
| protected:
|
| - const OwnPtr<InterpolableValue> m_start;
|
| - const OwnPtr<InterpolableValue> m_end;
|
| + const std::unique_ptr<InterpolableValue> m_start;
|
| + const std::unique_ptr<InterpolableValue> m_end;
|
|
|
| mutable double m_cachedFraction;
|
| mutable int m_cachedIteration;
|
| - mutable OwnPtr<InterpolableValue> m_cachedValue;
|
| + mutable std::unique_ptr<InterpolableValue> m_cachedValue;
|
|
|
| - Interpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end);
|
| + Interpolation(std::unique_ptr<InterpolableValue> start, std::unique_ptr<InterpolableValue> end);
|
|
|
| private:
|
| InterpolableValue* getCachedValueForTesting() const { return m_cachedValue.get(); }
|
|
|