| 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 } | 254 } |
| 255 | 255 |
| 256 virtual void DidRecreateOutputSurface(bool succeeded) OVERRIDE { | 256 virtual void DidRecreateOutputSurface(bool succeeded) OVERRIDE { |
| 257 test_hooks_->DidRecreateOutputSurface(succeeded); | 257 test_hooks_->DidRecreateOutputSurface(succeeded); |
| 258 } | 258 } |
| 259 | 259 |
| 260 virtual void DidFailToInitializeOutputSurface() OVERRIDE { | 260 virtual void DidFailToInitializeOutputSurface() OVERRIDE { |
| 261 test_hooks_->DidFailToInitializeOutputSurface(); | 261 test_hooks_->DidFailToInitializeOutputSurface(); |
| 262 } | 262 } |
| 263 | 263 |
| 264 virtual scoped_ptr<InputHandlerClient> CreateInputHandlerClient() OVERRIDE { | |
| 265 return scoped_ptr<InputHandlerClient>(); | |
| 266 } | |
| 267 | |
| 268 virtual void WillCommit() OVERRIDE {} | 264 virtual void WillCommit() OVERRIDE {} |
| 269 | 265 |
| 270 virtual void DidCommit() OVERRIDE { | 266 virtual void DidCommit() OVERRIDE { |
| 271 test_hooks_->DidCommit(); | 267 test_hooks_->DidCommit(); |
| 272 } | 268 } |
| 273 | 269 |
| 274 virtual void DidCommitAndDrawFrame() OVERRIDE { | 270 virtual void DidCommitAndDrawFrame() OVERRIDE { |
| 275 test_hooks_->DidCommitAndDrawFrame(); | 271 test_hooks_->DidCommitAndDrawFrame(); |
| 276 } | 272 } |
| 277 | 273 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 ASSERT_FALSE(layer_tree_host_.get()); | 572 ASSERT_FALSE(layer_tree_host_.get()); |
| 577 client_.reset(); | 573 client_.reset(); |
| 578 if (timed_out_) { | 574 if (timed_out_) { |
| 579 FAIL() << "Test timed out"; | 575 FAIL() << "Test timed out"; |
| 580 return; | 576 return; |
| 581 } | 577 } |
| 582 AfterTest(); | 578 AfterTest(); |
| 583 } | 579 } |
| 584 | 580 |
| 585 } // namespace cc | 581 } // namespace cc |
| OLD | NEW |