| Index: cc/tiles/tiling_set_raster_queue_all.cc
|
| diff --git a/cc/tiles/tiling_set_raster_queue_all.cc b/cc/tiles/tiling_set_raster_queue_all.cc
|
| index 1ed618a862b64c0a6458ca8d642a3a6aa24fe44d..ec5e4132773ed09fa91c65c1194a5fd06048b967 100644
|
| --- a/cc/tiles/tiling_set_raster_queue_all.cc
|
| +++ b/cc/tiles/tiling_set_raster_queue_all.cc
|
| @@ -35,10 +35,10 @@ TilingSetRasterQueueAll::TilingSetRasterQueueAll(
|
| // Find high and low res tilings and initialize the iterators.
|
| PictureLayerTiling* high_res_tiling = nullptr;
|
| PictureLayerTiling* low_res_tiling = nullptr;
|
| - // This variable would point to a tiling that has a NON_IDEAL_RESOLUTION
|
| - // resolution on the active tree, but HIGH_RESOLUTION on the pending tree.
|
| - // These tilings are the only non-ideal tilings that could have required for
|
| - // activation tiles, so they need to be considered for rasterization.
|
| + // This variable would point to a tiling that has a NON_IDEAL_RESOLUTION or
|
| + // LOW_RESOLUTION on the active tree, but HIGH_RESOLUTION on the pending tree.
|
| + // These tilings are the only non-high res tilings that could have required
|
| + // for activation tiles, so they need to be considered for rasterization.
|
| PictureLayerTiling* active_non_ideal_pending_high_res_tiling = nullptr;
|
| for (size_t i = 0; i < tiling_set_->num_tilings(); ++i) {
|
| PictureLayerTiling* tiling = tiling_set_->tiling_at(i);
|
| @@ -46,7 +46,7 @@ TilingSetRasterQueueAll::TilingSetRasterQueueAll(
|
| high_res_tiling = tiling;
|
| if (prioritize_low_res && tiling->resolution() == LOW_RESOLUTION)
|
| low_res_tiling = tiling;
|
| - if (tree == ACTIVE_TREE && tiling->resolution() == NON_IDEAL_RESOLUTION) {
|
| + if (tree == ACTIVE_TREE && tiling->resolution() != HIGH_RESOLUTION) {
|
| const PictureLayerTiling* twin =
|
| client->GetPendingOrActiveTwinTiling(tiling);
|
| if (twin && twin->resolution() == HIGH_RESOLUTION)
|
|
|