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 "cc/trees/occlusion_tracker.h" | 5 #include "cc/trees/occlusion_tracker.h" |
6 | 6 |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "cc/debug/lap_timer.h" | 9 #include "cc/debug/lap_timer.h" |
10 #include "cc/layers/layer_iterator.h" | 10 #include "cc/layers/layer_iterator.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 void CreateHost() { | 39 void CreateHost() { |
40 LayerTreeSettings settings; | 40 LayerTreeSettings settings; |
41 host_impl_ = LayerTreeHostImpl::Create( | 41 host_impl_ = LayerTreeHostImpl::Create( |
42 settings, &client_, &impl_task_runner_provider_, &stats_, | 42 settings, &client_, &impl_task_runner_provider_, &stats_, |
43 &shared_bitmap_manager_, nullptr, &task_graph_runner_, 1); | 43 &shared_bitmap_manager_, nullptr, &task_graph_runner_, 1); |
44 host_impl_->SetVisible(true); | 44 host_impl_->SetVisible(true); |
45 host_impl_->InitializeRenderer(output_surface_.get()); | 45 host_impl_->InitializeRenderer(output_surface_.get()); |
46 | 46 |
47 scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(active_tree(), 1); | 47 scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(active_tree(), 1); |
48 root_layer->SetHasRenderSurface(true); | 48 root_layer->SetHasRenderSurface(true); |
49 active_tree()->SetRootLayer(root_layer.Pass()); | 49 active_tree()->SetRootLayer(std::move(root_layer)); |
50 } | 50 } |
51 | 51 |
52 LayerTreeImpl* active_tree() { return host_impl_->active_tree(); } | 52 LayerTreeImpl* active_tree() { return host_impl_->active_tree(); } |
53 | 53 |
54 void SetTestName(const std::string& name) { test_name_ = name; } | 54 void SetTestName(const std::string& name) { test_name_ = name; } |
55 | 55 |
56 void PrintResults() { | 56 void PrintResults() { |
57 CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest()."; | 57 CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest()."; |
58 perf_test::PrintResult("occlusion_tracker_time", | 58 perf_test::PrintResult("occlusion_tracker_time", |
59 "", | 59 "", |
(...skipping 23 matching lines...) Expand all Loading... |
83 | 83 |
84 CreateHost(); | 84 CreateHost(); |
85 host_impl_->SetViewportSize(viewport_rect.size()); | 85 host_impl_->SetViewportSize(viewport_rect.size()); |
86 | 86 |
87 scoped_ptr<SolidColorLayerImpl> opaque_layer = | 87 scoped_ptr<SolidColorLayerImpl> opaque_layer = |
88 SolidColorLayerImpl::Create(active_tree(), 2); | 88 SolidColorLayerImpl::Create(active_tree(), 2); |
89 opaque_layer->SetBackgroundColor(SK_ColorRED); | 89 opaque_layer->SetBackgroundColor(SK_ColorRED); |
90 opaque_layer->SetContentsOpaque(true); | 90 opaque_layer->SetContentsOpaque(true); |
91 opaque_layer->SetDrawsContent(true); | 91 opaque_layer->SetDrawsContent(true); |
92 opaque_layer->SetBounds(viewport_rect.size()); | 92 opaque_layer->SetBounds(viewport_rect.size()); |
93 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); | 93 active_tree()->root_layer()->AddChild(std::move(opaque_layer)); |
94 | 94 |
95 bool update_lcd_text = false; | 95 bool update_lcd_text = false; |
96 active_tree()->UpdateDrawProperties(update_lcd_text); | 96 active_tree()->UpdateDrawProperties(update_lcd_text); |
97 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); | 97 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); |
98 ASSERT_EQ(1u, rsll.size()); | 98 ASSERT_EQ(1u, rsll.size()); |
99 EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size()); | 99 EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size()); |
100 | 100 |
101 LayerIterator begin = LayerIterator::Begin(&rsll); | 101 LayerIterator begin = LayerIterator::Begin(&rsll); |
102 LayerIterator end = LayerIterator::End(&rsll); | 102 LayerIterator end = LayerIterator::End(&rsll); |
103 | 103 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 | 152 |
153 for (int i = 0; i < kNumOpaqueLayers; ++i) { | 153 for (int i = 0; i < kNumOpaqueLayers; ++i) { |
154 scoped_ptr<SolidColorLayerImpl> opaque_layer = | 154 scoped_ptr<SolidColorLayerImpl> opaque_layer = |
155 SolidColorLayerImpl::Create(active_tree(), 2 + i); | 155 SolidColorLayerImpl::Create(active_tree(), 2 + i); |
156 opaque_layer->SetBackgroundColor(SK_ColorRED); | 156 opaque_layer->SetBackgroundColor(SK_ColorRED); |
157 opaque_layer->SetContentsOpaque(true); | 157 opaque_layer->SetContentsOpaque(true); |
158 opaque_layer->SetDrawsContent(true); | 158 opaque_layer->SetDrawsContent(true); |
159 opaque_layer->SetBounds( | 159 opaque_layer->SetBounds( |
160 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); | 160 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); |
161 opaque_layer->SetPosition(gfx::PointF(i, i)); | 161 opaque_layer->SetPosition(gfx::PointF(i, i)); |
162 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); | 162 active_tree()->root_layer()->AddChild(std::move(opaque_layer)); |
163 } | 163 } |
164 | 164 |
165 bool update_lcd_text = false; | 165 bool update_lcd_text = false; |
166 active_tree()->UpdateDrawProperties(update_lcd_text); | 166 active_tree()->UpdateDrawProperties(update_lcd_text); |
167 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); | 167 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); |
168 ASSERT_EQ(1u, rsll.size()); | 168 ASSERT_EQ(1u, rsll.size()); |
169 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), | 169 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), |
170 rsll[0]->render_surface()->layer_list().size()); | 170 rsll[0]->render_surface()->layer_list().size()); |
171 | 171 |
172 LayerIterator begin = LayerIterator::Begin(&rsll); | 172 LayerIterator begin = LayerIterator::Begin(&rsll); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); | 205 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); |
206 | 206 |
207 ++begin; | 207 ++begin; |
208 EXPECT_EQ(end, begin); | 208 EXPECT_EQ(end, begin); |
209 | 209 |
210 PrintResults(); | 210 PrintResults(); |
211 } | 211 } |
212 | 212 |
213 } // namespace | 213 } // namespace |
214 } // namespace cc | 214 } // namespace cc |
OLD | NEW |