| Index: cc/tiles/tile.h
|
| diff --git a/cc/tiles/tile.h b/cc/tiles/tile.h
|
| index aecd220b272e53d10934f38c79a3b3821cc85dd5..1bce3cd3603e9288b113ac54abaf07c93fffae91 100644
|
| --- a/cc/tiles/tile.h
|
| +++ b/cc/tiles/tile.h
|
| @@ -22,11 +22,6 @@ class TileManager;
|
|
|
| class CC_EXPORT Tile {
|
| public:
|
| - class CC_EXPORT Deleter {
|
| - public:
|
| - void operator()(Tile* tile) const;
|
| - };
|
| -
|
| class CC_EXPORT CreateInfo {
|
| public:
|
| const PictureLayerTiling* tiling;
|
| @@ -54,6 +49,8 @@ class CC_EXPORT Tile {
|
|
|
| typedef uint64_t Id;
|
|
|
| + ~Tile();
|
| +
|
| Id id() const {
|
| return id_;
|
| }
|
| @@ -131,7 +128,6 @@ class CC_EXPORT Tile {
|
| int layer_id,
|
| int source_frame_number,
|
| int flags);
|
| - ~Tile();
|
|
|
| TileManager* const tile_manager_;
|
| const PictureLayerTiling* tiling_;
|
| @@ -164,8 +160,6 @@ class CC_EXPORT Tile {
|
| DISALLOW_COPY_AND_ASSIGN(Tile);
|
| };
|
|
|
| -using ScopedTilePtr = std::unique_ptr<Tile, Tile::Deleter>;
|
| -
|
| } // namespace cc
|
|
|
| #endif // CC_TILES_TILE_H_
|
|
|