Index: cc/resources/tile.cc |
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc |
index 781d00899e13935ee458a7c6cef28c082d17c273..0315c90633997afe0e73b32cffbaa8b65381458e 100644 |
--- a/cc/resources/tile.cc |
+++ b/cc/resources/tile.cc |
@@ -25,7 +25,6 @@ Tile::Tile(TileManager* tile_manager, |
int source_frame_number, |
int flags) |
: RefCountedManaged<Tile>(tile_manager), |
- tile_manager_(tile_manager), |
tile_size_(tile_size), |
content_rect_(content_rect), |
contents_scale_(contents_scale), |
@@ -34,6 +33,9 @@ Tile::Tile(TileManager* tile_manager, |
layer_id_(layer_id), |
source_frame_number_(source_frame_number), |
flags_(flags), |
+ tiling_i_index_(-1), |
+ tiling_j_index_(-1), |
+ required_for_activation_(false), |
id_(s_next_id_++) { |
set_picture_pile(picture_pile); |
} |
@@ -45,19 +47,15 @@ Tile::~Tile() { |
} |
void Tile::SetPriority(WhichTree tree, const TilePriority& priority) { |
- if (priority == priority_[tree]) |
- return; |
- |
priority_[tree] = priority; |
- tile_manager_->DidChangeTilePriority(this); |
} |
void Tile::MarkRequiredForActivation() { |
- if (priority_[PENDING_TREE].required_for_activation) |
- return; |
+ required_for_activation_ = true; |
+} |
- priority_[PENDING_TREE].required_for_activation = true; |
- tile_manager_->DidChangeTilePriority(this); |
+void Tile::UnsetRequiredForActivation() { |
+ required_for_activation_ = false; |
} |
scoped_ptr<base::Value> Tile::AsValue() const { |