| Index: cc/resources/tile.h
|
| diff --git a/cc/resources/tile.h b/cc/resources/tile.h
|
| index 716ea99024703a4e4e8b0363d8d427201770ff6a..230fee0878712ff2a17f5a12d96c08330cb935ac 100644
|
| --- a/cc/resources/tile.h
|
| +++ b/cc/resources/tile.h
|
| @@ -60,11 +60,9 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
|
|
| void SetPriority(WhichTree tree, const TilePriority& priority);
|
|
|
| - void MarkRequiredForActivation();
|
| + void set_required_for_activation(bool is_required);
|
|
|
| - 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 +118,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;
|
| @@ -157,7 +169,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_;
|
| @@ -170,6 +181,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_;
|
|
|