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

cc/tile_manager.cc

Index: cc/tile_manager.cc
diff --git a/cc/tile_manager.cc b/cc/tile_manager.cc
index d06e18dc677e39931ed954cc393aabdb30ae22da..74e6393f6f8f72b3824c2c3ea6094d65a628c378 100644
--- a/cc/tile_manager.cc
+++ b/cc/tile_manager.cc
@@ -449,6 +449,17 @@ void TileManager::DidCompleteFrame() {
   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,