OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layer_tree_host.h" | 5 #include "cc/layer_tree_host.h" |
6 | 6 |
7 #include "cc/animation_curve.h" | 7 #include "cc/animation_curve.h" |
8 #include "cc/layer.h" | 8 #include "cc/layer.h" |
9 #include "cc/layer_animation_controller.h" | 9 #include "cc/layer_animation_controller.h" |
10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 base::TimeTicks monotonicTime, | 173 base::TimeTicks monotonicTime, |
174 bool hasUnfinishedAnimation) OVERRIDE { | 174 bool hasUnfinishedAnimation) OVERRIDE { |
175 started_animating_ = true; | 175 started_animating_ = true; |
176 } | 176 } |
177 | 177 |
178 virtual void drawLayersOnThread(LayerTreeHostImpl*) OVERRIDE { | 178 virtual void drawLayersOnThread(LayerTreeHostImpl*) OVERRIDE { |
179 if (started_animating_) | 179 if (started_animating_) |
180 endTest(); | 180 endTest(); |
181 } | 181 } |
182 | 182 |
183 virtual bool prepareToDrawOnThread(LayerTreeHostImpl*) OVERRIDE { | 183 virtual bool prepareToDrawOnThread( |
| 184 LayerTreeHostImpl* host_impl, |
| 185 LayerTreeHostImpl::FrameData& frame, |
| 186 bool result) OVERRIDE { |
184 return false; | 187 return false; |
185 } | 188 } |
186 | 189 |
187 virtual void afterTest() OVERRIDE {} | 190 virtual void afterTest() OVERRIDE {} |
188 | 191 |
189 private: | 192 private: |
190 bool started_animating_; | 193 bool started_animating_; |
191 }; | 194 }; |
192 | 195 |
193 // Starvation can only be an issue with the MT compositor. | 196 // Starvation can only be an issue with the MT compositor. |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 | 535 |
533 private: | 536 private: |
534 int num_commit_complete_; | 537 int num_commit_complete_; |
535 int num_draw_layers_; | 538 int num_draw_layers_; |
536 }; | 539 }; |
537 | 540 |
538 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate) | 541 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate) |
539 | 542 |
540 } // namespace | 543 } // namespace |
541 } // namespace cc | 544 } // namespace cc |
OLD | NEW |