| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/picture_layer_impl.h" | 5 #include "cc/layers/picture_layer_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 | 203 |
| 204 if (raster_source_->IsSolidColor()) { | 204 if (raster_source_->IsSolidColor()) { |
| 205 PopulateSharedQuadState(shared_quad_state); | 205 PopulateSharedQuadState(shared_quad_state); |
| 206 | 206 |
| 207 AppendDebugBorderQuad( | 207 AppendDebugBorderQuad( |
| 208 render_pass, bounds(), shared_quad_state, append_quads_data); | 208 render_pass, bounds(), shared_quad_state, append_quads_data); |
| 209 | 209 |
| 210 SolidColorLayerImpl::AppendSolidQuads( | 210 SolidColorLayerImpl::AppendSolidQuads( |
| 211 render_pass, draw_properties().occlusion_in_content_space, | 211 render_pass, draw_properties().occlusion_in_content_space, |
| 212 shared_quad_state, visible_layer_rect(), | 212 shared_quad_state, visible_layer_rect(), |
| 213 raster_source_->GetSolidColor(), append_quads_data); | 213 raster_source_->GetSolidColor(), append_quads_data, mask_type()); |
| 214 return; | 214 return; |
| 215 } | 215 } |
| 216 | 216 |
| 217 float device_scale_factor = | 217 float device_scale_factor = |
| 218 layer_tree_impl() ? layer_tree_impl()->device_scale_factor() : 1; | 218 layer_tree_impl() ? layer_tree_impl()->device_scale_factor() : 1; |
| 219 float max_contents_scale = MaximumTilingContentsScale(); | 219 float max_contents_scale = MaximumTilingContentsScale(); |
| 220 PopulateScaledSharedQuadState(shared_quad_state, max_contents_scale, | 220 PopulateScaledSharedQuadState(shared_quad_state, max_contents_scale, |
| 221 max_contents_scale); | 221 max_contents_scale); |
| 222 Occlusion scaled_occlusion = | 222 Occlusion scaled_occlusion = |
| 223 draw_properties() | 223 draw_properties() |
| (...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1479 } | 1479 } |
| 1480 | 1480 |
| 1481 invalidation_.Union(invalidation); | 1481 invalidation_.Union(invalidation); |
| 1482 tilings_->UpdateTilingsForImplSideInvalidation(invalidation); | 1482 tilings_->UpdateTilingsForImplSideInvalidation(invalidation); |
| 1483 SetNeedsPushProperties(); | 1483 SetNeedsPushProperties(); |
| 1484 TRACE_EVENT_END1("cc", "PictureLayerImpl::InvalidateRegionForImages", | 1484 TRACE_EVENT_END1("cc", "PictureLayerImpl::InvalidateRegionForImages", |
| 1485 "Invalidation", invalidation.ToString()); | 1485 "Invalidation", invalidation.ToString()); |
| 1486 } | 1486 } |
| 1487 | 1487 |
| 1488 } // namespace cc | 1488 } // namespace cc |
| OLD | NEW |