Index: cc/resources/managed_tile_state.cc |
diff --git a/cc/resources/managed_tile_state.cc b/cc/resources/managed_tile_state.cc |
index 6f85331dbb2bcce9d645b384a6f8e3cbbac8ae86..eaa89f8d4438a64700f4d0df7ce4c81f1eb0401f 100644 |
--- a/cc/resources/managed_tile_state.cc |
+++ b/cc/resources/managed_tile_state.cc |
@@ -33,11 +33,10 @@ scoped_ptr<base::Value> ManagedTileBinAsValue(ManagedTileBin bin) { |
case NEVER_BIN: |
return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
"NEVER_BIN")); |
- default: |
- DCHECK(false) << "Unrecognized ManagedTileBin value " << bin; |
- return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
- "<unknown ManagedTileBin value>")); |
} |
+ DCHECK(false) << "Unrecognized ManagedTileBin value " << bin; |
+ return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
+ "<unknown ManagedTileBin value>")); |
} |
scoped_ptr<base::Value> ManagedTileBinPriorityAsValue( |
vmpstr
2013/08/22 23:33:34
I don't think this function is used at all
|
@@ -49,11 +48,10 @@ scoped_ptr<base::Value> ManagedTileBinPriorityAsValue( |
case LOW_PRIORITY_BIN: |
return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
"LOW_PRIORITY_BIN")); |
- default: |
- DCHECK(false) << "Unrecognized ManagedTileBinPriority value"; |
- return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
- "<unknown ManagedTileBinPriority value>")); |
} |
+ DCHECK(false) << "Unrecognized ManagedTileBinPriority value"; |
+ return scoped_ptr<base::Value>(base::Value::CreateStringValue( |
+ "<unknown ManagedTileBinPriority value>")); |
} |
ManagedTileState::ManagedTileState() |
@@ -65,7 +63,7 @@ ManagedTileState::ManagedTileState() |
distance_to_visible_in_pixels(std::numeric_limits<float>::infinity()), |
visible_and_ready_to_draw(false), |
scheduled_priority(0) { |
- for (int i = 0; i < NUM_TREES; ++i) { |
+ for (int i = 0; i <= MAX_TREE; ++i) { |
tree_bin[i] = NEVER_BIN; |
bin[i] = NEVER_BIN; |
} |
@@ -87,10 +85,9 @@ bool ManagedTileState::TileVersion::IsReadyToDraw() const { |
case SOLID_COLOR_MODE: |
case PICTURE_PILE_MODE: |
return true; |
- default: |
- NOTREACHED(); |
- return false; |
} |
+ NOTREACHED(); |
+ return false; |
} |
size_t ManagedTileState::TileVersion::GPUMemoryUsageInBytes() const { |