Index: cc/resources/tile.cc |
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc |
index 48a10db70ffc205520fc8a26b41060420bab30b8..82d00d204f1e790c15ef5c270ae8e264a4d2b3c2 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), |
@@ -33,6 +32,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); |
for (int i = 0; i < NUM_TREES; i++) |
@@ -46,19 +48,11 @@ 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; |
- |
- priority_[PENDING_TREE].required_for_activation = true; |
- tile_manager_->DidChangeTilePriority(this); |
+void Tile::set_required_for_activation(bool is_required) { |
+ required_for_activation_ = is_required; |
} |
scoped_ptr<base::Value> Tile::AsValue() const { |