| 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/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "cc/debug/lap_timer.h" | 8 #include "cc/debug/lap_timer.h" |
| 9 #include "cc/layers/layer_iterator.h" | 9 #include "cc/layers/layer_iterator.h" |
| 10 #include "cc/layers/solid_color_layer_impl.h" | 10 #include "cc/layers/solid_color_layer_impl.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 79 |
| 80 CreateHost(); | 80 CreateHost(); |
| 81 host_impl_->SetViewportSize(viewport_rect.size()); | 81 host_impl_->SetViewportSize(viewport_rect.size()); |
| 82 | 82 |
| 83 scoped_ptr<SolidColorLayerImpl> opaque_layer = | 83 scoped_ptr<SolidColorLayerImpl> opaque_layer = |
| 84 SolidColorLayerImpl::Create(active_tree(), 2); | 84 SolidColorLayerImpl::Create(active_tree(), 2); |
| 85 opaque_layer->SetBackgroundColor(SK_ColorRED); | 85 opaque_layer->SetBackgroundColor(SK_ColorRED); |
| 86 opaque_layer->SetContentsOpaque(true); | 86 opaque_layer->SetContentsOpaque(true); |
| 87 opaque_layer->SetDrawsContent(true); | 87 opaque_layer->SetDrawsContent(true); |
| 88 opaque_layer->SetBounds(viewport_rect.size()); | 88 opaque_layer->SetBounds(viewport_rect.size()); |
| 89 opaque_layer->SetContentBounds(viewport_rect.size()); | |
| 90 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); | 89 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); |
| 91 | 90 |
| 92 bool update_lcd_text = false; | 91 bool update_lcd_text = false; |
| 93 active_tree()->UpdateDrawProperties(update_lcd_text); | 92 active_tree()->UpdateDrawProperties(update_lcd_text); |
| 94 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); | 93 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); |
| 95 ASSERT_EQ(1u, rsll.size()); | 94 ASSERT_EQ(1u, rsll.size()); |
| 96 EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size()); | 95 EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size()); |
| 97 | 96 |
| 98 LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll); | 97 LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll); |
| 99 LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll); | 98 LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 host_impl_->SetViewportSize(viewport_rect.size()); | 147 host_impl_->SetViewportSize(viewport_rect.size()); |
| 149 | 148 |
| 150 for (int i = 0; i < kNumOpaqueLayers; ++i) { | 149 for (int i = 0; i < kNumOpaqueLayers; ++i) { |
| 151 scoped_ptr<SolidColorLayerImpl> opaque_layer = | 150 scoped_ptr<SolidColorLayerImpl> opaque_layer = |
| 152 SolidColorLayerImpl::Create(active_tree(), 2 + i); | 151 SolidColorLayerImpl::Create(active_tree(), 2 + i); |
| 153 opaque_layer->SetBackgroundColor(SK_ColorRED); | 152 opaque_layer->SetBackgroundColor(SK_ColorRED); |
| 154 opaque_layer->SetContentsOpaque(true); | 153 opaque_layer->SetContentsOpaque(true); |
| 155 opaque_layer->SetDrawsContent(true); | 154 opaque_layer->SetDrawsContent(true); |
| 156 opaque_layer->SetBounds( | 155 opaque_layer->SetBounds( |
| 157 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); | 156 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); |
| 158 opaque_layer->SetContentBounds( | |
| 159 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); | |
| 160 opaque_layer->SetPosition(gfx::Point(i, i)); | 157 opaque_layer->SetPosition(gfx::Point(i, i)); |
| 161 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); | 158 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); |
| 162 } | 159 } |
| 163 | 160 |
| 164 bool update_lcd_text = false; | 161 bool update_lcd_text = false; |
| 165 active_tree()->UpdateDrawProperties(update_lcd_text); | 162 active_tree()->UpdateDrawProperties(update_lcd_text); |
| 166 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); | 163 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); |
| 167 ASSERT_EQ(1u, rsll.size()); | 164 ASSERT_EQ(1u, rsll.size()); |
| 168 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), | 165 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), |
| 169 rsll[0]->render_surface()->layer_list().size()); | 166 rsll[0]->render_surface()->layer_list().size()); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); | 201 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); |
| 205 | 202 |
| 206 ++begin; | 203 ++begin; |
| 207 EXPECT_EQ(end, begin); | 204 EXPECT_EQ(end, begin); |
| 208 | 205 |
| 209 PrintResults(); | 206 PrintResults(); |
| 210 } | 207 } |
| 211 | 208 |
| 212 } // namespace | 209 } // namespace |
| 213 } // namespace cc | 210 } // namespace cc |
| OLD | NEW |