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.h" | 5 #include "cc/test/layer_tree_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); } | 283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); } |
284 | 284 |
285 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 285 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
286 float scale, | 286 float scale, |
287 float top_controls_delta) OVERRIDE { | 287 float top_controls_delta) OVERRIDE { |
288 test_hooks_->ApplyViewportDeltas(scroll_delta, | 288 test_hooks_->ApplyViewportDeltas(scroll_delta, |
289 scale, | 289 scale, |
290 top_controls_delta); | 290 top_controls_delta); |
291 } | 291 } |
292 | 292 |
| 293 virtual void RecordCompositeTiming( |
| 294 int64_t rect_id, |
| 295 const std::vector<std::pair<int, base::TimeTicks> >& composites) |
| 296 OVERRIDE { |
| 297 test_hooks_->RecordCompositeTiming(rect_id, composites); |
| 298 } |
| 299 |
293 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) | 300 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) |
294 OVERRIDE { | 301 OVERRIDE { |
295 return test_hooks_->CreateOutputSurface(fallback); | 302 return test_hooks_->CreateOutputSurface(fallback); |
296 } | 303 } |
297 | 304 |
298 virtual void DidInitializeOutputSurface() OVERRIDE { | 305 virtual void DidInitializeOutputSurface() OVERRIDE { |
299 test_hooks_->DidInitializeOutputSurface(); | 306 test_hooks_->DidInitializeOutputSurface(); |
300 } | 307 } |
301 | 308 |
302 virtual void DidFailToInitializeOutputSurface() OVERRIDE { | 309 virtual void DidFailToInitializeOutputSurface() OVERRIDE { |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
701 return -1; | 708 return -1; |
702 } | 709 } |
703 | 710 |
704 void LayerTreeTest::DestroyLayerTreeHost() { | 711 void LayerTreeTest::DestroyLayerTreeHost() { |
705 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 712 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
706 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 713 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
707 layer_tree_host_.reset(); | 714 layer_tree_host_.reset(); |
708 } | 715 } |
709 | 716 |
710 } // namespace cc | 717 } // namespace cc |
OLD | NEW |