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

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorAnimation.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/platform/animation/CompositorAnimation.h
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimation.h b/third_party/WebKit/Source/platform/animation/CompositorAnimation.h
index 681141a6d6f589b5e4d3c7eefabaf923787de7f0..c3e7bd85a6589d49f7682504f6e860e08031ac9d 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimation.h
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimation.h
@@ -9,7 +9,8 @@
#include "platform/PlatformExport.h"
#include "platform/animation/CompositorTargetProperty.h"
#include "wtf/Noncopyable.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/PassOwnPtr.h"
+
#include <memory>
namespace cc {
@@ -28,9 +29,9 @@ public:
using Direction = cc::Animation::Direction;
using FillMode = cc::Animation::FillMode;
- static std::unique_ptr<CompositorAnimation> create(const blink::CompositorAnimationCurve& curve, CompositorTargetProperty::Type target, int groupId, int animationId)
+ static PassOwnPtr<CompositorAnimation> create(const blink::CompositorAnimationCurve& curve, CompositorTargetProperty::Type target, int groupId, int animationId)
{
- return wrapUnique(new CompositorAnimation(curve, target, animationId, groupId));
+ return adoptPtr(new CompositorAnimation(curve, target, animationId, groupId));
}
~CompositorAnimation();
@@ -67,7 +68,7 @@ public:
std::unique_ptr<cc::Animation> passAnimation();
- std::unique_ptr<CompositorFloatAnimationCurve> floatCurveForTesting() const;
+ PassOwnPtr<CompositorFloatAnimationCurve> floatCurveForTesting() const;
private:
CompositorAnimation(const CompositorAnimationCurve&, CompositorTargetProperty::Type, int animationId, int groupId);

Powered by Google App Engine
This is Rietveld 408576698