Index: cc/resources/tile.h |
diff --git a/cc/resources/tile.h b/cc/resources/tile.h |
index 04367fd9d0bf6ca2f70491cdd987b348ad7875d3..e639a36665995b596133ae5d82d189f5a12b467b 100644 |
--- a/cc/resources/tile.h |
+++ b/cc/resources/tile.h |
@@ -84,10 +84,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
} |
} |
- void MarkRequiredForActivation(); |
- |
- bool required_for_activation() const { |
- return priority_[PENDING_TREE].required_for_activation; |
+ bool required_for_activation() const { return required_for_activation_; } |
danakj
2014/09/19 01:41:47
can you TODO to remove this and always use IsTileR
vmpstr
2014/09/19 21:22:53
Done.
|
+ void set_required_for_activation(bool is_required) { |
+ required_for_activation_ = is_required; |
} |
bool use_picture_analysis() const { |
@@ -95,7 +94,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
} |
bool NeedsRasterForMode(RasterMode mode) const { |
- return !managed_state_.tile_versions[mode].IsReadyToDraw(); |
+ return managed_state_.tile_versions[mode].mode() == |
+ ManagedTileState::TileVersion::PICTURE_PILE_MODE || |
+ !managed_state_.tile_versions[mode].IsReadyToDraw(); |
} |
bool HasResources() const { |
@@ -146,6 +147,13 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
RasterMode DetermineRasterModeForTree(WhichTree tree) const; |
RasterMode DetermineOverallRasterMode() const; |
+ void set_tiling_index(int i, int j) { |
+ tiling_i_index_ = i; |
+ tiling_j_index_ = j; |
+ } |
+ int tiling_i_index() const { return tiling_i_index_; } |
+ int tiling_j_index() const { return tiling_j_index_; } |
+ |
// Functionality used in tests. |
RasterMode GetRasterModeForTesting() const { |
return managed_state().raster_mode; |
@@ -191,6 +199,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
int source_frame_number_; |
int flags_; |
bool is_shared_; |
+ int tiling_i_index_; |
+ int tiling_j_index_; |
+ bool required_for_activation_; |
Id id_; |
static Id s_next_id_; |