Chromium Code Reviews| Index: cc/resources/tile.h |
| diff --git a/cc/resources/tile.h b/cc/resources/tile.h |
| index 29acf80a1e35d116e309dde63d4a9f3c8d5aa1a3..c44c1a42e89d5717315b9272baa887573ab0165c 100644 |
| --- a/cc/resources/tile.h |
| +++ b/cc/resources/tile.h |
| @@ -61,10 +61,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
| void SetPriority(WhichTree tree, const TilePriority& priority); |
| void MarkRequiredForActivation(); |
| + void UnsetRequiredForActivation(); |
|
reveman
2014/07/07 20:48:13
I think these functions should be replaced with:
s
|
| - bool required_for_activation() const { |
| - return priority_[PENDING_TREE].required_for_activation; |
| - } |
| + bool required_for_activation() const { return required_for_activation_; } |
| bool use_picture_analysis() const { |
| return !!(flags_ & USE_PICTURE_ANALYSIS); |
| @@ -120,6 +119,20 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
| RasterMode DetermineRasterModeForTree(WhichTree tree) const; |
| RasterMode DetermineOverallRasterMode() const; |
| + void set_tiling_index(int row, int column) { |
| + tiling_i_index_ = row; |
| + tiling_j_index_ = column; |
| + } |
| + |
| + int tiling_i_index() const { |
| + DCHECK_GE(tiling_i_index_, 0); |
| + return tiling_i_index_; |
| + } |
| + int tiling_j_index() const { |
| + DCHECK_GE(tiling_j_index_, 0); |
| + return tiling_j_index_; |
| + } |
| + |
| // Functionality used in tests. |
| RasterMode GetRasterModeForTesting() const { |
| return managed_state().raster_mode; |
| @@ -154,7 +167,6 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
| const ManagedTileState& managed_state() const { return managed_state_; } |
| RasterMode DetermineRasterModeForResolution(TileResolution resolution) const; |
| - TileManager* tile_manager_; |
| scoped_refptr<PicturePileImpl> picture_pile_; |
| gfx::Rect tile_size_; |
| gfx::Rect content_rect_; |
| @@ -167,6 +179,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
| int layer_id_; |
| int source_frame_number_; |
| int flags_; |
| + int tiling_i_index_; |
| + int tiling_j_index_; |
| + bool required_for_activation_; |
| Id id_; |
| static Id s_next_id_; |