| Index: cc/resources/tile_priority.h
|
| diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h
|
| index 02aadae9e0a24a1386b74bd1b9145caf1175a211..b2864c114339e607a9db31d8cd1b373d96b39f30 100644
|
| --- a/cc/resources/tile_priority.h
|
| +++ b/cc/resources/tile_priority.h
|
| @@ -44,7 +44,6 @@ struct CC_EXPORT TilePriority {
|
|
|
| TilePriority()
|
| : resolution(NON_IDEAL_RESOLUTION),
|
| - required_for_activation(false),
|
| priority_bin(EVENTUALLY),
|
| distance_to_visible(std::numeric_limits<float>::infinity()) {}
|
|
|
| @@ -52,7 +51,6 @@ struct CC_EXPORT TilePriority {
|
| PriorityBin bin,
|
| float distance_to_visible)
|
| : resolution(resolution),
|
| - required_for_activation(false),
|
| priority_bin(bin),
|
| distance_to_visible(distance_to_visible) {}
|
|
|
| @@ -66,9 +64,6 @@ struct CC_EXPORT TilePriority {
|
| else
|
| resolution = NON_IDEAL_RESOLUTION;
|
|
|
| - required_for_activation =
|
| - active.required_for_activation || pending.required_for_activation;
|
| -
|
| if (active.priority_bin < pending.priority_bin) {
|
| priority_bin = active.priority_bin;
|
| distance_to_visible = active.distance_to_visible;
|
| @@ -87,8 +82,7 @@ struct CC_EXPORT TilePriority {
|
| bool operator ==(const TilePriority& other) const {
|
| return resolution == other.resolution &&
|
| priority_bin == other.priority_bin &&
|
| - distance_to_visible == other.distance_to_visible &&
|
| - required_for_activation == other.required_for_activation;
|
| + distance_to_visible == other.distance_to_visible;
|
| }
|
|
|
| bool operator !=(const TilePriority& other) const {
|
| @@ -102,7 +96,6 @@ struct CC_EXPORT TilePriority {
|
| }
|
|
|
| TileResolution resolution;
|
| - bool required_for_activation;
|
| PriorityBin priority_bin;
|
| float distance_to_visible;
|
| };
|
| @@ -120,12 +113,7 @@ enum TileMemoryLimitPolicy {
|
| ALLOW_PREPAINT_ONLY = 2, // Grande.
|
|
|
| // You're the only thing in town. Go crazy.
|
| - ALLOW_ANYTHING = 3, // Venti.
|
| -
|
| - NUM_TILE_MEMORY_LIMIT_POLICIES = 4,
|
| -
|
| - // NOTE: Be sure to update TreePriorityAsValue and kBinPolicyMap when adding
|
| - // or reordering fields.
|
| + ALLOW_ANYTHING = 3 // Venti.
|
| };
|
| std::string TileMemoryLimitPolicyToString(TileMemoryLimitPolicy policy);
|
|
|
|
|