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) |