| Index: cc/resources/prioritized_tile_set.cc
|
| diff --git a/cc/resources/prioritized_tile_set.cc b/cc/resources/prioritized_tile_set.cc
|
| index 6255be941377617408f4f0f7d27faf8622ce51d1..4f7ecaa53477e524d7f6bde141b9173a42561613 100644
|
| --- a/cc/resources/prioritized_tile_set.cc
|
| +++ b/cc/resources/prioritized_tile_set.cc
|
| @@ -18,9 +18,6 @@ class BinComparator {
|
| const ManagedTileState& ams = a->managed_state();
|
| const ManagedTileState& bms = b->managed_state();
|
|
|
| - if (ams.bin[LOW_PRIORITY_BIN] != bms.bin[LOW_PRIORITY_BIN])
|
| - return ams.bin[LOW_PRIORITY_BIN] < bms.bin[LOW_PRIORITY_BIN];
|
| -
|
| if (ams.required_for_activation != bms.required_for_activation)
|
| return ams.required_for_activation;
|
|
|
| @@ -51,16 +48,17 @@ typedef std::vector<scoped_refptr<Tile> > TileVector;
|
| void SortBinTiles(ManagedTileBin bin, TileVector* tiles) {
|
| switch (bin) {
|
| case NOW_AND_READY_TO_DRAW_BIN:
|
| + case NEVER_BIN:
|
| break;
|
| case NOW_BIN:
|
| case SOON_BIN:
|
| case EVENTUALLY_AND_ACTIVE_BIN:
|
| case EVENTUALLY_BIN:
|
| - case NEVER_AND_ACTIVE_BIN:
|
| - case NEVER_BIN:
|
| + case AT_LAST_AND_ACTIVE_BIN:
|
| + case AT_LAST_BIN:
|
| std::sort(tiles->begin(), tiles->end(), BinComparator());
|
| break;
|
| - default:
|
| + case NUM_BINS:
|
| NOTREACHED();
|
| }
|
| }
|
|
|