| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 } | 259 } |
| 260 | 260 |
| 261 virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE { | 261 virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE { |
| 262 test_hooks_->DidInitializeOutputSurface(succeeded); | 262 test_hooks_->DidInitializeOutputSurface(succeeded); |
| 263 } | 263 } |
| 264 | 264 |
| 265 virtual void DidFailToInitializeOutputSurface() OVERRIDE { | 265 virtual void DidFailToInitializeOutputSurface() OVERRIDE { |
| 266 test_hooks_->DidFailToInitializeOutputSurface(); | 266 test_hooks_->DidFailToInitializeOutputSurface(); |
| 267 } | 267 } |
| 268 | 268 |
| 269 virtual scoped_ptr<InputHandlerClient> CreateInputHandlerClient() OVERRIDE { | |
| 270 return scoped_ptr<InputHandlerClient>(); | |
| 271 } | |
| 272 | |
| 273 virtual void WillCommit() OVERRIDE {} | 269 virtual void WillCommit() OVERRIDE {} |
| 274 | 270 |
| 275 virtual void DidCommit() OVERRIDE { | 271 virtual void DidCommit() OVERRIDE { |
| 276 test_hooks_->DidCommit(); | 272 test_hooks_->DidCommit(); |
| 277 } | 273 } |
| 278 | 274 |
| 279 virtual void DidCommitAndDrawFrame() OVERRIDE { | 275 virtual void DidCommitAndDrawFrame() OVERRIDE { |
| 280 test_hooks_->DidCommitAndDrawFrame(); | 276 test_hooks_->DidCommitAndDrawFrame(); |
| 281 } | 277 } |
| 282 | 278 |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 ASSERT_FALSE(layer_tree_host_.get()); | 578 ASSERT_FALSE(layer_tree_host_.get()); |
| 583 client_.reset(); | 579 client_.reset(); |
| 584 if (timed_out_) { | 580 if (timed_out_) { |
| 585 FAIL() << "Test timed out"; | 581 FAIL() << "Test timed out"; |
| 586 return; | 582 return; |
| 587 } | 583 } |
| 588 AfterTest(); | 584 AfterTest(); |
| 589 } | 585 } |
| 590 | 586 |
| 591 } // namespace cc | 587 } // namespace cc |
| OLD | NEW |