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

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

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cb61588415caa01f3b286baaa1c79d491a1eb08a..47698978a4961ac229d87eda6788ff8acddf2c6b 100644
--- a/third_party/WebKit/Source/core/animation/Animation.cpp
+++ b/third_party/WebKit/Source/core/animation/Animation.cpp
@@ -762,7 +762,7 @@ void Animation::setCompositorPending(bool effectChanged)
// FIXME: KeyframeEffect could notify this directly?
if (!hasActiveAnimationsOnCompositor()) {
destroyCompositorPlayer();
- m_compositorState.clear();
+ m_compositorState.reset();
}
if (effectChanged && m_compositorState) {
m_compositorState->effectChanged = true;
@@ -919,7 +919,7 @@ void Animation::destroyCompositorPlayer()
if (m_compositorPlayer) {
detachCompositorTimeline();
m_compositorPlayer->setAnimationDelegate(nullptr);
- m_compositorPlayer.clear();
+ m_compositorPlayer.reset();
}
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698