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

Unified Diff: cc/layer_tree_host_unittest.cc

Issue 11598005: Ref count layer animation controllers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index b8d79d9cf42289d77aa64fdbe7401c96fc173fa7..50088dbe9c4739dfc66c60fc9ec6fb074541b93f 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -604,12 +604,12 @@ public:
postAddInstantAnimationToMainThread();
}
- virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime) OVERRIDE
+ virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime, bool hasUnfinishedAnimation) OVERRIDE
{
if (!m_numAnimates) {
// The animation had zero duration so layerTreeHostImpl should no
// longer need to animate its layers.
- EXPECT_FALSE(layerTreeHostImpl->needsAnimateLayers());
+ EXPECT_FALSE(hasUnfinishedAnimation);
m_numAnimates++;
m_firstMonotonicTime = monotonicTime;
return;
@@ -659,7 +659,7 @@ public:
{
}
- virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime) OVERRIDE
+ virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime, bool hasUnfinishedAnimation) OVERRIDE
{
m_startedAnimating = true;
}
@@ -736,7 +736,7 @@ public:
postAddAnimationToMainThread(m_layerTreeHost->rootLayer());
}
- virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime) OVERRIDE
+ virtual void animateLayers(LayerTreeHostImpl* layerTreeHostImpl, base::TimeTicks monotonicTime, bool hasUnfinishedAnimation) OVERRIDE
{
const ActiveAnimation* animation = m_layerTreeHost->rootLayer()->layerAnimationController()->getActiveAnimation(0, ActiveAnimation::Opacity);
if (!animation)
« cc/layer_tree_host.cc ('K') | « cc/layer_tree_host_impl.cc ('k') | cc/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698