| 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" |
| 11 #include "cc/animation/timing_function.h" | 11 #include "cc/animation/timing_function.h" |
| 12 #include "cc/base/switches.h" | 12 #include "cc/base/switches.h" |
| 13 #include "cc/debug/test_context_provider.h" | 13 #include "cc/debug/test_context_provider.h" |
| 14 #include "cc/input/input_handler.h" | 14 #include "cc/input/input_handler.h" |
| 15 #include "cc/layers/content_layer.h" | 15 #include "cc/layers/content_layer.h" |
| 16 #include "cc/layers/layer.h" | 16 #include "cc/layers/layer.h" |
| 17 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
| 18 #include "cc/test/animation_test_common.h" | 18 #include "cc/test/animation_test_common.h" |
| 19 #include "cc/test/fake_layer_tree_host_client.h" | 19 #include "cc/test/fake_layer_tree_host_client.h" |
| 20 #include "cc/test/fake_output_surface.h" | 20 #include "cc/test/fake_output_surface.h" |
| 21 #include "cc/test/occlusion_tracker_test_common.h" | 21 #include "cc/test/occlusion_tracker_test_common.h" |
| 22 #include "cc/test/tiled_layer_test_common.h" | 22 #include "cc/test/tiled_layer_test_common.h" |
| 23 #include "cc/trees/layer_tree_host_impl.h" | 23 #include "cc/trees/layer_tree_host_impl.h" |
| 24 #include "cc/trees/single_thread_proxy.h" | 24 #include "cc/trees/single_thread_proxy.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 25 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include "ui/gfx/frame_time.h" |
| 26 #include "ui/gfx/size_conversions.h" | 27 #include "ui/gfx/size_conversions.h" |
| 27 | 28 |
| 28 namespace cc { | 29 namespace cc { |
| 29 | 30 |
| 30 TestHooks::TestHooks() {} | 31 TestHooks::TestHooks() {} |
| 31 | 32 |
| 32 TestHooks::~TestHooks() {} | 33 TestHooks::~TestHooks() {} |
| 33 | 34 |
| 34 bool TestHooks::PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, | 35 bool TestHooks::PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, |
| 35 LayerTreeHostImpl::FrameData* frame_data, | 36 LayerTreeHostImpl::FrameData* frame_data, |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 return; | 585 return; |
| 585 | 586 |
| 586 // If the LTH is not visible, defer the composite until the LTH is made | 587 // If the LTH is not visible, defer the composite until the LTH is made |
| 587 // visible. | 588 // visible. |
| 588 if (!layer_tree_host_->visible()) { | 589 if (!layer_tree_host_->visible()) { |
| 589 schedule_when_set_visible_true_ = true; | 590 schedule_when_set_visible_true_ = true; |
| 590 return; | 591 return; |
| 591 } | 592 } |
| 592 | 593 |
| 593 schedule_when_set_visible_true_ = false; | 594 schedule_when_set_visible_true_ = false; |
| 594 base::TimeTicks now = base::TimeTicks::Now(); | 595 base::TimeTicks now = gfx::FrameTime::Now(); |
| 595 layer_tree_host_->Composite(now); | 596 layer_tree_host_->Composite(now); |
| 596 } | 597 } |
| 597 | 598 |
| 598 void LayerTreeTest::RunTest(bool threaded, | 599 void LayerTreeTest::RunTest(bool threaded, |
| 599 bool delegating_renderer, | 600 bool delegating_renderer, |
| 600 bool impl_side_painting) { | 601 bool impl_side_painting) { |
| 601 if (threaded) { | 602 if (threaded) { |
| 602 impl_thread_.reset(new base::Thread("Compositor")); | 603 impl_thread_.reset(new base::Thread("Compositor")); |
| 603 ASSERT_TRUE(impl_thread_->Start()); | 604 ASSERT_TRUE(impl_thread_->Start()); |
| 604 } | 605 } |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 } | 661 } |
| 661 | 662 |
| 662 scoped_refptr<ContextProvider> LayerTreeTest::OffscreenContextProvider() { | 663 scoped_refptr<ContextProvider> LayerTreeTest::OffscreenContextProvider() { |
| 663 if (!compositor_contexts_.get() || | 664 if (!compositor_contexts_.get() || |
| 664 compositor_contexts_->DestroyedOnMainThread()) | 665 compositor_contexts_->DestroyedOnMainThread()) |
| 665 compositor_contexts_ = TestContextProvider::Create(); | 666 compositor_contexts_ = TestContextProvider::Create(); |
| 666 return compositor_contexts_; | 667 return compositor_contexts_; |
| 667 } | 668 } |
| 668 | 669 |
| 669 } // namespace cc | 670 } // namespace cc |
| OLD | NEW |