| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, | 233 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, |
| 234 float scale) OVERRIDE { | 234 float scale) OVERRIDE { |
| 235 test_hooks_->ApplyScrollAndScale(scroll_delta, scale); | 235 test_hooks_->ApplyScrollAndScale(scroll_delta, scale); |
| 236 } | 236 } |
| 237 | 237 |
| 238 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) | 238 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) |
| 239 OVERRIDE { | 239 OVERRIDE { |
| 240 return test_hooks_->CreateOutputSurface(fallback); | 240 return test_hooks_->CreateOutputSurface(fallback); |
| 241 } | 241 } |
| 242 | 242 |
| 243 virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE { | 243 virtual void DidInitializeOutputSurface() OVERRIDE { |
| 244 test_hooks_->DidInitializeOutputSurface(succeeded); | 244 test_hooks_->DidInitializeOutputSurface(); |
| 245 } | 245 } |
| 246 | 246 |
| 247 virtual void DidFailToInitializeOutputSurface() OVERRIDE { | 247 virtual void DidFailToInitializeOutputSurface() OVERRIDE { |
| 248 test_hooks_->DidFailToInitializeOutputSurface(); | 248 test_hooks_->DidFailToInitializeOutputSurface(); |
| 249 } | 249 } |
| 250 | 250 |
| 251 virtual void WillCommit() OVERRIDE { test_hooks_->WillCommit(); } | 251 virtual void WillCommit() OVERRIDE { test_hooks_->WillCommit(); } |
| 252 | 252 |
| 253 virtual void DidCommit() OVERRIDE { test_hooks_->DidCommit(); } | 253 virtual void DidCommit() OVERRIDE { test_hooks_->DidCommit(); } |
| 254 | 254 |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 return -1; | 693 return -1; |
| 694 } | 694 } |
| 695 | 695 |
| 696 void LayerTreeTest::DestroyLayerTreeHost() { | 696 void LayerTreeTest::DestroyLayerTreeHost() { |
| 697 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 697 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
| 698 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 698 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
| 699 layer_tree_host_.reset(); | 699 layer_tree_host_.reset(); |
| 700 } | 700 } |
| 701 | 701 |
| 702 } // namespace cc | 702 } // namespace cc |
| OLD | NEW |