Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3507)

Unified Diff: cc/resources/tile_priority.h

Issue 367833003: cc: Start using raster/eviction iterators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resources/tile_priority.h
diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h
index f8ac9c6c7b0e7a148e929b10a6ab8fbe0392cd24..d85dd3999334090580eebcc05426377e573f3b96 100644
--- a/cc/resources/tile_priority.h
+++ b/cc/resources/tile_priority.h
@@ -45,7 +45,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()) {}
@@ -53,7 +52,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) {}
@@ -67,9 +65,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;
@@ -88,8 +83,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 {
@@ -103,7 +97,6 @@ struct CC_EXPORT TilePriority {
}
TileResolution resolution;
- bool required_for_activation;
PriorityBin priority_bin;
float distance_to_visible;
};
@@ -122,11 +115,6 @@ enum TileMemoryLimitPolicy {
// 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.
};
scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
TileMemoryLimitPolicy policy);
@@ -135,8 +123,6 @@ enum TreePriority {
SAME_PRIORITY_FOR_BOTH_TREES,
SMOOTHNESS_TAKES_PRIORITY,
NEW_CONTENT_TAKES_PRIORITY
-
- // Be sure to update TreePriorityAsValue when adding new fields.
};
scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio);
@@ -157,17 +143,6 @@ class GlobalStateThatImpactsTilePriority {
TreePriority tree_priority;
- bool operator==(const GlobalStateThatImpactsTilePriority& other) const {
- return memory_limit_policy == other.memory_limit_policy &&
- soft_memory_limit_in_bytes == other.soft_memory_limit_in_bytes &&
- hard_memory_limit_in_bytes == other.hard_memory_limit_in_bytes &&
- num_resources_limit == other.num_resources_limit &&
- tree_priority == other.tree_priority;
- }
- bool operator!=(const GlobalStateThatImpactsTilePriority& other) const {
- return !(*this == other);
- }
-
scoped_ptr<base::Value> AsValue() const;
};

Powered by Google App Engine
This is Rietveld 408576698