| Index: cc/resources/tile.h
|
| diff --git a/cc/resources/tile.h b/cc/resources/tile.h
|
| index e9ba91c1e4b2aeac66836cf19222057896210204..45c2b0482fdd77414203a12d8e463c8e0b8f678d 100644
|
| --- a/cc/resources/tile.h
|
| +++ b/cc/resources/tile.h
|
| @@ -6,6 +6,7 @@
|
| #define CC_RESOURCES_TILE_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| +#include "cc/base/ref_counted_managed.h"
|
| #include "cc/resources/raster_source.h"
|
| #include "cc/resources/tile_draw_info.h"
|
| #include "cc/resources/tile_priority.h"
|
| @@ -16,13 +17,8 @@ namespace cc {
|
|
|
| class TileManager;
|
|
|
| -class CC_EXPORT Tile {
|
| +class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
| public:
|
| - class Deleter {
|
| - public:
|
| - void operator()(Tile* tile) const;
|
| - };
|
| -
|
| enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0 };
|
|
|
| typedef uint64 Id;
|
| @@ -100,7 +96,9 @@ class CC_EXPORT Tile {
|
|
|
| private:
|
| friend class TileManager;
|
| + friend class PrioritizedTileSet;
|
| friend class FakeTileManager;
|
| + friend class BinComparator;
|
| friend class FakePictureLayerImpl;
|
|
|
| // Methods called by by tile manager.
|
| @@ -116,7 +114,6 @@ class CC_EXPORT Tile {
|
|
|
| bool HasRasterTask() const { return !!raster_task_.get(); }
|
|
|
| - TileManager* tile_manager_;
|
| scoped_refptr<RasterSource> raster_source_;
|
| gfx::Size desired_texture_size_;
|
| gfx::Rect content_rect_;
|
| @@ -144,8 +141,6 @@ class CC_EXPORT Tile {
|
| DISALLOW_COPY_AND_ASSIGN(Tile);
|
| };
|
|
|
| -using ScopedTilePtr = scoped_ptr<Tile, Tile::Deleter>;
|
| -
|
| } // namespace cc
|
|
|
| #endif // CC_RESOURCES_TILE_H_
|
|
|