| Index: cc/resources/tile.h
|
| diff --git a/cc/resources/tile.h b/cc/resources/tile.h
|
| index fd184a6c75cac9aeca64412618b4aece2ad2a6b7..0b6a67638a54cbd26e44c695de9726b4fe564eef 100644
|
| --- a/cc/resources/tile.h
|
| +++ b/cc/resources/tile.h
|
| @@ -104,7 +104,7 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
| return managed_state_.tile_versions[mode];
|
| }
|
|
|
| - gfx::Size size() const { return tile_size_.size(); }
|
| + gfx::Size size() const { return tile_size_; }
|
|
|
| private:
|
| friend class TileManager;
|
| @@ -113,23 +113,25 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
| friend class BinComparator;
|
|
|
| // Methods called by by tile manager.
|
| - Tile(TileManager* tile_manager,
|
| - PicturePileImpl* picture_pile,
|
| - gfx::Size tile_size,
|
| - gfx::Rect content_rect,
|
| - gfx::Rect opaque_rect,
|
| - float contents_scale,
|
| - int layer_id,
|
| - int source_frame_number,
|
| - bool can_use_lcd_text);
|
| + explicit Tile(TileManager* tile_manager);
|
| ~Tile();
|
|
|
| + void Reset(PicturePileImpl* picture_pile,
|
| + gfx::Size tile_size,
|
| + gfx::Rect content_rect,
|
| + gfx::Rect opaque_rect,
|
| + float contents_scale,
|
| + int layer_id,
|
| + int source_frame_number,
|
| + bool can_use_lcd_text);
|
| +
|
| ManagedTileState& managed_state() { return managed_state_; }
|
| const ManagedTileState& managed_state() const { return managed_state_; }
|
| + void reset_picture_pile() { picture_pile_ = NULL; }
|
|
|
| TileManager* tile_manager_;
|
| scoped_refptr<PicturePileImpl> picture_pile_;
|
| - gfx::Rect tile_size_;
|
| + gfx::Size tile_size_;
|
| gfx::Rect content_rect_;
|
| float contents_scale_;
|
| gfx::Rect opaque_rect_;
|
|
|