| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/thread_task_runner_handle.h" | 5 #include "base/thread_task_runner_handle.h" |
| 6 #include "base/threading/simple_thread.h" | 6 #include "base/threading/simple_thread.h" |
| 7 #include "cc/layers/delegated_frame_provider.h" | 7 #include "cc/layers/delegated_frame_provider.h" |
| 8 #include "cc/layers/delegated_frame_resource_collection.h" | 8 #include "cc/layers/delegated_frame_resource_collection.h" |
| 9 #include "cc/layers/delegated_renderer_layer.h" | 9 #include "cc/layers/delegated_renderer_layer.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| 11 #include "cc/layers/solid_color_layer.h" | 11 #include "cc/layers/solid_color_layer.h" |
| 12 #include "cc/output/delegated_frame_data.h" | 12 #include "cc/output/delegated_frame_data.h" |
| 13 #include "cc/output/output_surface.h" | 13 #include "cc/output/output_surface.h" |
| 14 #include "cc/output/output_surface_client.h" | 14 #include "cc/output/output_surface_client.h" |
| 15 #include "cc/resources/resource_provider.h" | 15 #include "cc/resources/resource_provider.h" |
| 16 #include "cc/scheduler/begin_frame_source.h" | 16 #include "cc/scheduler/begin_frame_source.h" |
| 17 #include "cc/test/fake_delegated_renderer_layer.h" | 17 #include "cc/test/fake_delegated_renderer_layer.h" |
| 18 #include "cc/test/test_context_provider.h" | 18 #include "cc/test/test_context_provider.h" |
| 19 #include "cc/test/test_task_graph_runner.h" |
| 19 #include "cc/trees/layer_tree_host.h" | 20 #include "cc/trees/layer_tree_host.h" |
| 20 #include "cc/trees/layer_tree_host_client.h" | 21 #include "cc/trees/layer_tree_host_client.h" |
| 21 #include "cc/trees/layer_tree_host_single_thread_client.h" | 22 #include "cc/trees/layer_tree_host_single_thread_client.h" |
| 22 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 23 #include "third_party/skia/include/core/SkColor.h" | 24 #include "third_party/skia/include/core/SkColor.h" |
| 24 | 25 |
| 25 namespace cc { | 26 namespace cc { |
| 26 namespace { | 27 namespace { |
| 27 | 28 |
| 28 class NoMessageLoopOutputSurface : public OutputSurface { | 29 class NoMessageLoopOutputSurface : public OutputSurface { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 103 |
| 103 void SetupLayerTreeHost() { | 104 void SetupLayerTreeHost() { |
| 104 LayerTreeSettings settings; | 105 LayerTreeSettings settings; |
| 105 settings.single_thread_proxy_scheduler = false; | 106 settings.single_thread_proxy_scheduler = false; |
| 106 settings.verify_property_trees = false; | 107 settings.verify_property_trees = false; |
| 107 settings.raster_enabled = false; | 108 settings.raster_enabled = false; |
| 108 | 109 |
| 109 LayerTreeHost::InitParams params; | 110 LayerTreeHost::InitParams params; |
| 110 params.client = this; | 111 params.client = this; |
| 111 params.settings = &settings; | 112 params.settings = &settings; |
| 113 params.task_graph_runner = &task_graph_runner_; |
| 112 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(this, ¶ms); | 114 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(this, ¶ms); |
| 113 layer_tree_host_->SetViewportSize(size_); | 115 layer_tree_host_->SetViewportSize(size_); |
| 114 layer_tree_host_->SetRootLayer(root_layer_); | 116 layer_tree_host_->SetRootLayer(root_layer_); |
| 115 } | 117 } |
| 116 | 118 |
| 117 void Composite() { | 119 void Composite() { |
| 118 did_commit_ = false; | 120 did_commit_ = false; |
| 119 did_commit_and_draw_frame_ = false; | 121 did_commit_and_draw_frame_ = false; |
| 120 layer_tree_host_->Composite(base::TimeTicks::Now()); | 122 layer_tree_host_->Composite(base::TimeTicks::Now()); |
| 121 EXPECT_TRUE(did_initialize_output_surface_); | 123 EXPECT_TRUE(did_initialize_output_surface_); |
| 122 EXPECT_TRUE(did_commit_); | 124 EXPECT_TRUE(did_commit_); |
| 123 EXPECT_TRUE(did_commit_and_draw_frame_); | 125 EXPECT_TRUE(did_commit_and_draw_frame_); |
| 124 } | 126 } |
| 125 | 127 |
| 126 void TearDownLayerTreeHost() { | 128 void TearDownLayerTreeHost() { |
| 127 // Explicit teardown to make failures easier to debug. | 129 // Explicit teardown to make failures easier to debug. |
| 128 layer_tree_host_ = nullptr; | 130 layer_tree_host_ = nullptr; |
| 129 root_layer_ = nullptr; | 131 root_layer_ = nullptr; |
| 130 } | 132 } |
| 131 | 133 |
| 132 // All protected member variables are accessed only on |no_loop_thread_|. | 134 // All protected member variables are accessed only on |no_loop_thread_|. |
| 135 TestTaskGraphRunner task_graph_runner_; |
| 133 scoped_ptr<LayerTreeHost> layer_tree_host_; | 136 scoped_ptr<LayerTreeHost> layer_tree_host_; |
| 134 scoped_refptr<Layer> root_layer_; | 137 scoped_refptr<Layer> root_layer_; |
| 135 | 138 |
| 136 bool did_initialize_output_surface_; | 139 bool did_initialize_output_surface_; |
| 137 bool did_commit_; | 140 bool did_commit_; |
| 138 bool did_commit_and_draw_frame_; | 141 bool did_commit_and_draw_frame_; |
| 139 gfx::Size size_; | 142 gfx::Size size_; |
| 140 | 143 |
| 141 private: | 144 private: |
| 142 base::DelegateSimpleThread no_loop_thread_; | 145 base::DelegateSimpleThread no_loop_thread_; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 243 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
| 241 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 244 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
| 242 }; | 245 }; |
| 243 | 246 |
| 244 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 247 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
| 245 RunTest(); | 248 RunTest(); |
| 246 } | 249 } |
| 247 | 250 |
| 248 } // namespace | 251 } // namespace |
| 249 } // namespace cc | 252 } // namespace cc |
| OLD | NEW |