| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 host_impl_->SetViewportSize(viewport_rect.size()); | 152 host_impl_->SetViewportSize(viewport_rect.size()); |
| 153 | 153 |
| 154 for (int i = 0; i < kNumOpaqueLayers; ++i) { | 154 for (int i = 0; i < kNumOpaqueLayers; ++i) { |
| 155 scoped_ptr<SolidColorLayerImpl> opaque_layer = | 155 scoped_ptr<SolidColorLayerImpl> opaque_layer = |
| 156 SolidColorLayerImpl::Create(active_tree(), 2 + i); | 156 SolidColorLayerImpl::Create(active_tree(), 2 + i); |
| 157 opaque_layer->SetBackgroundColor(SK_ColorRED); | 157 opaque_layer->SetBackgroundColor(SK_ColorRED); |
| 158 opaque_layer->SetContentsOpaque(true); | 158 opaque_layer->SetContentsOpaque(true); |
| 159 opaque_layer->SetDrawsContent(true); | 159 opaque_layer->SetDrawsContent(true); |
| 160 opaque_layer->SetBounds( | 160 opaque_layer->SetBounds( |
| 161 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); | 161 gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2)); |
| 162 opaque_layer->SetPosition(gfx::Point(i, i)); | 162 opaque_layer->SetPosition(gfx::PointF(i, i)); |
| 163 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); | 163 active_tree()->root_layer()->AddChild(opaque_layer.Pass()); |
| 164 } | 164 } |
| 165 | 165 |
| 166 bool update_lcd_text = false; | 166 bool update_lcd_text = false; |
| 167 active_tree()->UpdateDrawProperties(update_lcd_text); | 167 active_tree()->UpdateDrawProperties(update_lcd_text); |
| 168 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); | 168 const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList(); |
| 169 ASSERT_EQ(1u, rsll.size()); | 169 ASSERT_EQ(1u, rsll.size()); |
| 170 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), | 170 EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers), |
| 171 rsll[0]->render_surface()->layer_list().size()); | 171 rsll[0]->render_surface()->layer_list().size()); |
| 172 | 172 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); | 206 EXPECT_EQ(active_tree()->root_layer(), next.current_layer); |
| 207 | 207 |
| 208 ++begin; | 208 ++begin; |
| 209 EXPECT_EQ(end, begin); | 209 EXPECT_EQ(end, begin); |
| 210 | 210 |
| 211 PrintResults(); | 211 PrintResults(); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace | 214 } // namespace |
| 215 } // namespace cc | 215 } // namespace cc |
| OLD | NEW |