OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/layer_tree_test_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
6 | 6 |
7 #include "cc/animation.h" | 7 #include "cc/animation.h" |
8 #include "cc/animation_registrar.h" | 8 #include "cc/animation_registrar.h" |
9 #include "cc/content_layer.h" | 9 #include "cc/content_layer.h" |
10 #include "cc/input_handler.h" | 10 #include "cc/input_handler.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 LayerTreeHostImpl::animateLayers(monotonicTime, wallClockTime); | 131 LayerTreeHostImpl::animateLayers(monotonicTime, wallClockTime); |
132 m_testHooks->animateLayers(this, monotonicTime); | 132 m_testHooks->animateLayers(this, monotonicTime); |
133 } | 133 } |
134 | 134 |
135 void MockLayerTreeHostImpl::updateAnimationState() | 135 void MockLayerTreeHostImpl::updateAnimationState() |
136 { | 136 { |
137 LayerTreeHostImpl::updateAnimationState(); | 137 LayerTreeHostImpl::updateAnimationState(); |
138 bool hasUnfinishedAnimation = false; | 138 bool hasUnfinishedAnimation = false; |
139 AnimationRegistrar::AnimationControllerMap::const_iterator iter = activeAnim
ationControllers().begin(); | 139 AnimationRegistrar::AnimationControllerMap::const_iterator iter = activeAnim
ationControllers().begin(); |
140 for (; iter != activeAnimationControllers().end(); ++iter) { | 140 for (; iter != activeAnimationControllers().end(); ++iter) { |
141 if (iter->second->hasActiveAnimation()) { | 141 if (iter->second->HasActiveAnimation()) { |
142 hasUnfinishedAnimation = true; | 142 hasUnfinishedAnimation = true; |
143 break; | 143 break; |
144 } | 144 } |
145 } | 145 } |
146 m_testHooks->updateAnimationState(this, hasUnfinishedAnimation); | 146 m_testHooks->updateAnimationState(this, hasUnfinishedAnimation); |
147 } | 147 } |
148 | 148 |
149 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const | 149 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const |
150 { | 150 { |
151 return base::TimeDelta::FromMilliseconds(16); | 151 return base::TimeDelta::FromMilliseconds(16); |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 ASSERT_FALSE(m_layerTreeHost.get()); | 514 ASSERT_FALSE(m_layerTreeHost.get()); |
515 m_client.reset(); | 515 m_client.reset(); |
516 if (m_timedOut) { | 516 if (m_timedOut) { |
517 FAIL() << "Test timed out"; | 517 FAIL() << "Test timed out"; |
518 return; | 518 return; |
519 } | 519 } |
520 afterTest(); | 520 afterTest(); |
521 } | 521 } |
522 | 522 |
523 } // namespace cc | 523 } // namespace cc |
OLD | NEW |