| 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/layers/tiled_layer.h" | 5 #include "cc/layers/tiled_layer.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "cc/debug/overdraw_metrics.h" | 10 #include "cc/debug/overdraw_metrics.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 layer_tree_host_->root_layer()->AddChild(layer1); | 128 layer_tree_host_->root_layer()->AddChild(layer1); |
| 129 if (layer2.get() && !layer2->parent()) | 129 if (layer2.get() && !layer2->parent()) |
| 130 layer_tree_host_->root_layer()->AddChild(layer2); | 130 layer_tree_host_->root_layer()->AddChild(layer2); |
| 131 if (occlusion_) | 131 if (occlusion_) |
| 132 occlusion_->SetRenderTarget(layer_tree_host_->root_layer()); | 132 occlusion_->SetRenderTarget(layer_tree_host_->root_layer()); |
| 133 | 133 |
| 134 LayerList render_surface_layer_list; | 134 LayerList render_surface_layer_list; |
| 135 LayerTreeHostCommon::CalculateDrawProperties( | 135 LayerTreeHostCommon::CalculateDrawProperties( |
| 136 layer_tree_host_->root_layer(), | 136 layer_tree_host_->root_layer(), |
| 137 layer_tree_host_->device_viewport_size(), | 137 layer_tree_host_->device_viewport_size(), |
| 138 gfx::Transform(), |
| 138 layer_tree_host_->device_scale_factor(), | 139 layer_tree_host_->device_scale_factor(), |
| 139 1.f, // page_scale_factor | 140 1.f, // page_scale_factor |
| 140 NULL, | 141 NULL, |
| 141 layer_tree_host_->GetRendererCapabilities().max_texture_size, | 142 layer_tree_host_->GetRendererCapabilities().max_texture_size, |
| 142 false, // can_use_lcd_text | 143 false, // can_use_lcd_text |
| 143 true, // can_adjust_raster_scale | 144 true, // can_adjust_raster_scale |
| 144 &render_surface_layer_list); | 145 &render_surface_layer_list); |
| 145 } | 146 } |
| 146 | 147 |
| 147 bool UpdateAndPush(const scoped_refptr<FakeTiledLayer>& layer1, | 148 bool UpdateAndPush(const scoped_refptr<FakeTiledLayer>& layer1, |
| (...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1845 // Invalidate the entire layer in layer space. When painting, the rect given | 1846 // Invalidate the entire layer in layer space. When painting, the rect given |
| 1846 // to webkit should match the layer's bounds. | 1847 // to webkit should match the layer's bounds. |
| 1847 layer->SetNeedsDisplayRect(layer_rect); | 1848 layer->SetNeedsDisplayRect(layer_rect); |
| 1848 layer->Update(queue_.get(), 0, NULL); | 1849 layer->Update(queue_.get(), 0, NULL); |
| 1849 | 1850 |
| 1850 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); | 1851 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); |
| 1851 } | 1852 } |
| 1852 | 1853 |
| 1853 } // namespace | 1854 } // namespace |
| 1854 } // namespace cc | 1855 } // namespace cc |
| OLD | NEW |