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

Unified Diff: third_party/WebKit/Source/core/animation/TypedInterpolationValue.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months 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: third_party/WebKit/Source/core/animation/TypedInterpolationValue.h
diff --git a/third_party/WebKit/Source/core/animation/TypedInterpolationValue.h b/third_party/WebKit/Source/core/animation/TypedInterpolationValue.h
index 28dd675a51b67265dcefc12360f117e1be3f188f..993ddf9dfb7445f542c8aa8703afe7ee851e1dec 100644
--- a/third_party/WebKit/Source/core/animation/TypedInterpolationValue.h
+++ b/third_party/WebKit/Source/core/animation/TypedInterpolationValue.h
@@ -6,8 +6,6 @@
#define TypedInterpolationValue_h
#include "core/animation/InterpolationValue.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -16,12 +14,12 @@ class InterpolationType;
// Represents an interpolated value between an adjacent pair of PropertySpecificKeyframes.
class TypedInterpolationValue {
public:
- static std::unique_ptr<TypedInterpolationValue> create(const InterpolationType& type, std::unique_ptr<InterpolableValue> interpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
+ static PassOwnPtr<TypedInterpolationValue> create(const InterpolationType& type, PassOwnPtr<InterpolableValue> interpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
{
- return wrapUnique(new TypedInterpolationValue(type, std::move(interpolableValue), nonInterpolableValue));
+ return adoptPtr(new TypedInterpolationValue(type, std::move(interpolableValue), nonInterpolableValue));
}
- std::unique_ptr<TypedInterpolationValue> clone() const
+ PassOwnPtr<TypedInterpolationValue> clone() const
{
InterpolationValue copy = m_value.clone();
return create(m_type, std::move(copy.interpolableValue), copy.nonInterpolableValue.release());
@@ -35,7 +33,7 @@ public:
InterpolationValue& mutableValue() { return m_value; }
private:
- TypedInterpolationValue(const InterpolationType& type, std::unique_ptr<InterpolableValue> interpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue)
+ TypedInterpolationValue(const InterpolationType& type, PassOwnPtr<InterpolableValue> interpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue)
: m_type(type)
, m_value(std::move(interpolableValue), nonInterpolableValue)
{

Powered by Google App Engine
This is Rietveld 408576698