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

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp

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.cpp
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
index 63becca188b64d6a98367fd892ec6e3236e8ccaf..2b73cd831014f25808bf54d6b22619cb0e570c4c 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
@@ -13,7 +13,6 @@
#include "platform/animation/CompositorFloatAnimationCurve.h"
#include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
#include "platform/animation/CompositorTransformAnimationCurve.h"
-#include <memory>
using cc::Animation;
using cc::AnimationIdProvider;
@@ -127,7 +126,7 @@ std::unique_ptr<cc::Animation> CompositorAnimation::passAnimation()
return std::move(m_animation);
}
-std::unique_ptr<CompositorFloatAnimationCurve> CompositorAnimation::floatCurveForTesting() const
+PassOwnPtr<CompositorFloatAnimationCurve> CompositorAnimation::floatCurveForTesting() const
{
const cc::AnimationCurve* curve = m_animation->curve();
DCHECK_EQ(cc::AnimationCurve::FLOAT, curve->Type());

Powered by Google App Engine
This is Rietveld 408576698