| Index: cc/tile_manager.h
|
| diff --git a/cc/tile_manager.h b/cc/tile_manager.h
|
| index 3d198bd40c974b45baf391571365c65561d91442..9338b148134811980ce8d8bcd7e7eeba522cbc4c 100644
|
| --- a/cc/tile_manager.h
|
| +++ b/cc/tile_manager.h
|
| @@ -78,11 +78,12 @@ class CC_EXPORT ManagedTileState : public base::RefCounted<ManagedTileState> {
|
| public:
|
| ManagedTileState(Tile* tile);
|
| scoped_ptr<base::Value> AsValue() const;
|
| + bool can_be_freed() const { return !cannot_be_freed_ref.get(); }
|
|
|
| // Persisted state: valid all the time.
|
| scoped_refptr<Tile> tile;
|
| bool can_use_gpu_memory;
|
| - bool can_be_freed;
|
| + scoped_refptr<ManagedTileState> cannot_be_freed_ref;
|
| scoped_ptr<ResourcePool::Resource> resource;
|
| bool resource_is_being_initialized;
|
| bool contents_swizzled;
|
| @@ -187,7 +188,6 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
|
| scoped_refptr<ManagedTileState> tile,
|
| scoped_ptr<ResourcePool::Resource> resource,
|
| int manage_tiles_call_count_when_dispatched);
|
| - void DidFinishTileInitialization(ManagedTileState* mts);
|
| void DidTileRasterStateChange(ManagedTileState* mts, TileRasterState state);
|
| void DidTileTreeBinChange(ManagedTileState* mts,
|
| TileManagerBin new_tree_bin,
|
|
|