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

Unified Diff: third_party/WebKit/Source/core/animation/Animation.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge. 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/Animation.cpp
diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp
index 47698978a4961ac229d87eda6788ff8acddf2c6b..3dbed43b7c62ce29ac9df6a1dc7a0be0de1926f6 100644
--- a/third_party/WebKit/Source/core/animation/Animation.cpp
+++ b/third_party/WebKit/Source/core/animation/Animation.cpp
@@ -46,6 +46,7 @@
#include "public/platform/Platform.h"
#include "public/platform/WebCompositorSupport.h"
#include "wtf/MathExtras.h"
+#include "wtf/PtrUtil.h"
namespace blink {
@@ -294,7 +295,7 @@ bool Animation::preCommit(int compositorGroup, bool startOnCompositor)
createCompositorPlayer();
if (maybeStartAnimationOnCompositor())
- m_compositorState = adoptPtr(new CompositorState(*this));
+ m_compositorState = wrapUnique(new CompositorState(*this));
else
cancelIncompatibleAnimationsOnCompositor();
}
@@ -903,7 +904,7 @@ void Animation::createCompositorPlayer()
{
if (Platform::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
ASSERT(Platform::current()->compositorSupport());
- m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
+ m_compositorPlayer = wrapUnique(CompositorFactory::current().createAnimationPlayer());
ASSERT(m_compositorPlayer);
m_compositorPlayer->setAnimationDelegate(this);
attachCompositorTimeline();

Powered by Google App Engine
This is Rietveld 408576698