| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 private: | 69 private: |
| 70 TestHooks* test_hooks_; | 70 TestHooks* test_hooks_; |
| 71 | 71 |
| 72 virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE { | 72 virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE { |
| 73 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation(); | 73 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation(); |
| 74 test_hooks_->ScheduledActionBeginOutputSurfaceCreation(); | 74 test_hooks_->ScheduledActionBeginOutputSurfaceCreation(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 virtual void ScheduledActionSendBeginMainFrame() OVERRIDE { | 77 virtual void ScheduledActionSendBeginMainFrame() OVERRIDE { |
| 78 test_hooks_->ScheduledActionWillSendBeginMainFrame(); |
| 78 ThreadProxy::ScheduledActionSendBeginMainFrame(); | 79 ThreadProxy::ScheduledActionSendBeginMainFrame(); |
| 79 test_hooks_->ScheduledActionSendBeginMainFrame(); | 80 test_hooks_->ScheduledActionSendBeginMainFrame(); |
| 80 } | 81 } |
| 81 | 82 |
| 82 virtual void ScheduledActionCommit() OVERRIDE { | 83 virtual void ScheduledActionCommit() OVERRIDE { |
| 83 ThreadProxy::ScheduledActionCommit(); | 84 ThreadProxy::ScheduledActionCommit(); |
| 84 test_hooks_->ScheduledActionCommit(); | 85 test_hooks_->ScheduledActionCommit(); |
| 85 } | 86 } |
| 86 | 87 |
| 87 virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE { | 88 virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE { |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 return -1; | 737 return -1; |
| 737 } | 738 } |
| 738 | 739 |
| 739 void LayerTreeTest::DestroyLayerTreeHost() { | 740 void LayerTreeTest::DestroyLayerTreeHost() { |
| 740 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 741 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
| 741 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 742 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
| 742 layer_tree_host_.reset(); | 743 layer_tree_host_.reset(); |
| 743 } | 744 } |
| 744 | 745 |
| 745 } // namespace cc | 746 } // namespace cc |
| OLD | NEW |