Index: cc/resources/prioritized_tile_set.cc |
diff --git a/cc/resources/prioritized_tile_set.cc b/cc/resources/prioritized_tile_set.cc |
index d1cc5b7f80c5aed7a365fbe842b51d3c43283a11..80b350c9acd867b35c8eca9e60f9fc99417a3b85 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<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: |
reveman
2013/08/26 23:22:13
nit: "default: NOTREACHED()" would be more consist
danakj
2013/08/27 02:23:43
:(
|
NOTREACHED(); |
} |
} |