cc: Complete pending tile uploads if they are needed for tree activation

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 431 matching lines @@
     DidTileRasterStateChange(tile, IDLE_STATE);
     tiles_with_pending_upload_.pop();
   }
 }
 
 void TileManager::DidCompleteFrame() {
   allow_cheap_tasks_ = true;
   did_schedule_cheap_tasks_ = false;
 }
 
+void TileManager::FlushPendingTileUploadIfNeeded(Tile* tile) {
+  ManagedTileState& managed_tile_state = tile->managed_state();
+  if (managed_tile_state.raster_state == UPLOAD_STATE &&
+      managed_tile_state.resource_is_being_initialized) {
+    DCHECK(managed_tile_state.resource);
+    Resource* resource = managed_tile_state.resource.get();
+    resource_pool_->resource_provider()->InsertWaitForSetPixels(resource->id());
+    managed_tile_state.resource_is_being_initialized = false;

[reveman, 2013/03/07 20:31:58]

I like this approach of not moving the tile out of tiles_with_pending_upload_
until the query has passed.

This introduces a new state for the tile though. A state where we know the
upload will be done at the time we draw. I think this deserves a new raster
state instead of keeping it in UPLOAD_STATE.

[Sami, 2013/03/08 18:01:10]

Done, I've added UPLOAD_FLUSHED_STATE.

+  }
+}
+
 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 < live_or_allocated_tiles_.size(); i++) {
     const Tile* tile = live_or_allocated_tiles_[i];
     const ManagedTileState& mts = tile->managed_state();
@@ skipping 526 matching lines @@
     decode_begin_time = base::TimeTicks::HighResNow();
   pixel_ref->Decode();
   if (stats) {
     stats->totalDeferredImageDecodeCount++;
     stats->totalDeferredImageDecodeTime +=
         base::TimeTicks::HighResNow() - decode_begin_time;
   }
 }
 
 }  // namespace cc