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

cc/tile_manager.h

 // 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.
 
 #ifndef CC_TILE_MANAGER_H_
 #define CC_TILE_MANAGER_H_
 
 #include <list>
 #include <queue>
 #include <set>
@@ skipping 43 matching lines @@
   NUM_BIN_PRIORITIES = 2
 };
 scoped_ptr<base::Value> TileManagerBinPriorityAsValue(
     TileManagerBinPriority bin);
 
 enum TileRasterState {
   IDLE_STATE = 0,
   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);
 
 // This is state that is specific to a tile that is
 // managed by the TileManager.
 class CC_EXPORT ManagedTileState {
  public:
   ManagedTileState();
   ~ManagedTileState();
@@ skipping 37 matching lines @@
   virtual ~TileManager();
 
   const GlobalStateThatImpactsTilePriority& GlobalState() const {
       return global_state_;
   }
   void SetGlobalState(const GlobalStateThatImpactsTilePriority& state);
 
   void ManageTiles();
   void CheckForCompletedTileUploads();
   void AbortPendingTileUploads();
+  void FlushPendingTileUploadIfNeeded(Tile* tile);
   void DidCompleteFrame();
 
   scoped_ptr<base::Value> BasicStateAsValue() const;
   scoped_ptr<base::Value> AllTilesAsValue() const;
   void GetMemoryStats(size_t* memoryRequiredBytes,
                       size_t* memoryNiceToHaveBytes,
                       size_t* memoryUsedBytes) const;
   void SetRecordRenderingStats(bool record_rendering_stats);
   void GetRenderingStats(RenderingStats* stats);
   bool HasPendingWorkScheduled(WhichTree tree) const;
@@ skipping 116 matching lines @@
   bool allow_cheap_tasks_;
   int raster_state_count_[NUM_STATES][NUM_TREES][NUM_BINS];
   bool prediction_benchmarking_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_MANAGER_H_