cc: Fix tile manager shutdown by aborting all pending uploads.

cc/tile_manager.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tile_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 125 matching lines @@
 }
 
 TileManager::~TileManager() {
   // Reset global state and manage. This should cause
   // our memory usage to drop to zero.
   global_state_ = GlobalStateThatImpactsTilePriority();
   AssignGpuMemoryToTiles();
   // This should finish all pending tasks and release any uninitialized
   // resources.
   raster_worker_pool_.reset();
-  CheckForCompletedTileUploads();
+  AbortPendingTileUploads();
   DCHECK(tiles_with_pending_set_pixels_.size() == 0);
   DCHECK(tiles_.size() == 0);
 }
 
 void TileManager::SetGlobalState(
     const GlobalStateThatImpactsTilePriority& global_state) {
   global_state_ = global_state;
   resource_pool_->SetMaxMemoryUsageBytes(global_state_.memory_limit_in_bytes);
   ScheduleManageTiles();
 }
@@ skipping 210 matching lines @@
     DidFinishTileInitialization(tile);
 
     bytes_pending_set_pixels_ -= tile->bytes_consumed_if_allocated();
     DidTileRasterStateChange(tile, IDLE_STATE);
     tiles_with_pending_set_pixels_.pop();
   }
 
   DispatchMoreTasks();
 }
 
+void TileManager::AbortPendingTileUploads() {
+  while (!tiles_with_pending_set_pixels_.empty()) {
+    Tile* tile = tiles_with_pending_set_pixels_.front();
+    ManagedTileState& managed_tile_state = tile->managed_state();
+    DCHECK(managed_tile_state.resource);
+
+    resource_pool_->resource_provider()->abortSetPixels(
+        managed_tile_state.resource->id());
+    resource_pool_->resource_provider()->releasePixelBuffer(
+        managed_tile_state.resource->id());
+
+    managed_tile_state.resource_is_being_initialized = false;
+    managed_tile_state.can_be_freed = true;
+    managed_tile_state.can_use_gpu_memory = false;
+    FreeResourcesForTile(tile);
+
+    bytes_pending_set_pixels_ -= tile->bytes_consumed_if_allocated();
+    DidTileRasterStateChange(tile, IDLE_STATE);
+    tiles_with_pending_set_pixels_.pop();
+  }
+}
+
 void TileManager::GetMemoryStats(
     size_t* memoryRequiredBytes,
     size_t* memoryNiceToHaveBytes,
     size_t* memoryUsedBytes) const {
   *memoryRequiredBytes = 0;
   *memoryNiceToHaveBytes = 0;
   *memoryUsedBytes = 0;
   for(size_t i = 0; i < tiles_.size(); i++) {
     const Tile* tile = tiles_[i];
     const ManagedTileState& mts = tile->managed_state();
@@ skipping 491 matching lines @@
     decode_begin_time = base::TimeTicks::Now();
   pixel_ref->Decode();
   if (stats) {
     stats->totalDeferredImageDecodeCount++;
     stats->totalDeferredImageDecodeTime +=
         base::TimeTicks::Now() - decode_begin_time;
   }
 }
 
 }  // namespace cc