| Index: cc/tiles/picture_layer_tiling.cc
|
| diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
|
| index 3ae1ad97e53abdab385a36508dba801b724049da..b886197987a32b5b09e794b76333d8e35e66be83 100644
|
| --- a/cc/tiles/picture_layer_tiling.cc
|
| +++ b/cc/tiles/picture_layer_tiling.cc
|
| @@ -845,25 +845,21 @@ TilePriority PictureLayerTiling::ComputePriorityForTile(
|
| const Tile* tile,
|
| PriorityRectType priority_rect_type) const {
|
| // TODO(vmpstr): See if this can be moved to iterators.
|
| - TilePriority::PriorityBin max_tile_priority_bin =
|
| - client_->GetMaxTilePriorityBin();
|
| -
|
| DCHECK_EQ(ComputePriorityRectTypeForTile(tile), priority_rect_type);
|
| DCHECK_EQ(TileAt(tile->tiling_i_index(), tile->tiling_j_index()), tile);
|
|
|
| - TilePriority::PriorityBin priority_bin = max_tile_priority_bin;
|
| + TilePriority::PriorityBin priority_bin = client_->GetMaxTilePriorityBin();
|
|
|
| switch (priority_rect_type) {
|
| case VISIBLE_RECT:
|
| return TilePriority(resolution_, priority_bin, 0);
|
| case PENDING_VISIBLE_RECT:
|
| - if (max_tile_priority_bin <= TilePriority::SOON)
|
| - return TilePriority(resolution_, TilePriority::SOON, 0);
|
| - priority_bin = TilePriority::EVENTUALLY;
|
| - break;
|
| + if (priority_bin < TilePriority::SOON)
|
| + priority_bin = TilePriority::SOON;
|
| + return TilePriority(resolution_, priority_bin, 0);
|
| case SKEWPORT_RECT:
|
| case SOON_BORDER_RECT:
|
| - if (max_tile_priority_bin <= TilePriority::SOON)
|
| + if (priority_bin < TilePriority::SOON)
|
| priority_bin = TilePriority::SOON;
|
| break;
|
| case EVENTUALLY_RECT:
|
|
|