| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index 8edacf6896dbeeefb13022df1f679404577f09f4..117a0e3f345322759ef0aebe02df79e75a0847e9 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -543,6 +543,8 @@ void TileManager::AssignGpuMemoryToTiles() {
|
| }
|
|
|
| void TileManager::FreeResourcesForTile(Tile* tile) {
|
| + tile->tile_version().resource_id_ = 0;
|
| + tile->tile_version().forced_upload_ = false;
|
| if (tile->tile_version().resource_) {
|
| resource_pool_->ReleaseResource(
|
| tile->tile_version().resource_.Pass());
|
| @@ -623,6 +625,8 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
|
| tile->tile_version().resource_format_);
|
| const Resource* const_resource = resource.get();
|
|
|
| + DCHECK(!tile->tile_version().resource_id_);
|
| + DCHECK(!tile->tile_version().forced_upload_);
|
| tile->tile_version().resource_id_ = resource->id();
|
|
|
| PicturePileImpl::Analysis* analysis = new PicturePileImpl::Analysis;
|
| @@ -706,6 +710,7 @@ void TileManager::OnRasterTaskCompleted(
|
| resource_pool_->ReleaseResource(resource.Pass());
|
| } else {
|
| tile->tile_version().resource_ = resource.Pass();
|
| + tile->tile_version().forced_upload_ = false;
|
| }
|
|
|
| DidFinishTileInitialization(tile.get());
|
|
|