Chromium Code Reviews| Index: cc/layers/picture_layer_impl.cc |
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
| index c3c7ca021104ba5f2468b233838d45beee16c845..b21339d3b21d1886a6a60368d4cea8568f879dbf 100644 |
| --- a/cc/layers/picture_layer_impl.cc |
| +++ b/cc/layers/picture_layer_impl.cc |
| @@ -688,6 +688,12 @@ PictureLayerTiling* PictureLayerImpl::GetRecycledTwinTiling( |
| return recycled_twin->tilings_->TilingAtScale(tiling->contents_scale()); |
| } |
| +TilePriority::PriorityBin PictureLayerImpl::GetMaxTilePriorityBin() const { |
| + if (!HasValidTilePriorities()) |
| + return TilePriority::EVENTUALLY; |
| + return TilePriority::NOW; |
| +} |
| + |
| size_t PictureLayerImpl::GetMaxTilesForInterestArea() const { |
| return layer_tree_impl()->settings().max_tiles_for_interest_area; |
| } |
| @@ -1591,10 +1597,10 @@ PictureLayerImpl::LayerEvictionTileIterator::LayerEvictionTileIterator( |
| current_category_(PictureLayerTiling::EVENTUALLY), |
| current_tiling_range_type_(PictureLayerTilingSet::HIGHER_THAN_HIGH_RES), |
| current_tiling_(CurrentTilingRange().start - 1u) { |
|
USE eero AT chromium.org
2014/11/11 17:12:50
CurrentTilingRange must not be called if the layer
|
| - // TODO(vmpstr): Once tile priorities are determined by the iterators, ensure |
| - // that layers that don't have valid tile priorities have lowest priorities so |
| - // they evict their tiles first (crbug.com/381704) |
| - DCHECK(layer_->tilings_); |
| + // Early out if the layer has no tilings. |
| + if (!layer_->tilings_ || !layer_->tilings_->num_tilings()) |
| + return; |
| + |
| do { |
| if (!AdvanceToNextTiling()) |
| break; |