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

cc/tile_manager.h

Index: cc/tile_manager.h
diff --git a/cc/tile_manager.h b/cc/tile_manager.h
index 095f9a872f593bfd0872fdf9bda7de3b0589b37f..46831504e8fe3c46ffbe87c6ea766c47d9e324cc 100644
--- a/cc/tile_manager.h
+++ b/cc/tile_manager.h
@@ -61,7 +61,8 @@ enum TileRasterState {
   WAITING_FOR_RASTER_STATE = 1,
   RASTER_STATE = 2,
   UPLOAD_STATE = 3,
-  NUM_STATES = 4
+  UPLOAD_FLUSHED_STATE = 4,
+  NUM_STATES = 5
 };
 scoped_ptr<base::Value> TileRasterStateAsValue(
     TileRasterState bin);
@@ -119,6 +120,7 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
   void ManageTiles();
   void CheckForCompletedTileUploads();
   void AbortPendingTileUploads();
+  void FlushPendingTileUploadIfNeeded(Tile* tile);
   void DidCompleteFrame();
 
   scoped_ptr<base::Value> BasicStateAsValue() const;