cc: Upload cheap tiles synchronously

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 <vector>
@@ skipping 39 matching lines @@
 enum TileManagerBinPriority {
   HIGH_PRIORITY_BIN = 0,
   LOW_PRIORITY_BIN = 1,
   NUM_BIN_PRIORITIES = 2
 };
 
 enum TileRasterState {
   IDLE_STATE = 0,
   WAITING_FOR_RASTER_STATE = 1,
   RASTER_STATE = 2,
-  SET_PIXELS_STATE = 3,
+  UPLOAD_STATE = 3,
   NUM_STATES = 4
 };
 
+enum TileUploadMethod {
+  TILE_UPLOAD_ASYNC = 0,
+  TILE_UPLOAD_SYNC = 1
+};
+
 // This is state that is specific to a tile that is
 // managed by the TileManager.
 class CC_EXPORT ManagedTileState {
  public:
   ManagedTileState();
   ~ManagedTileState();
 
   // Persisted state: valid all the time.
   bool can_use_gpu_memory;
   bool can_be_freed;
@@ skipping 74 matching lines @@
   void OnImageDecodeTaskCompleted(
       scoped_refptr<Tile> tile, uint32_t pixel_ref_id);
   bool CanDispatchRasterTask(Tile* tile) const;
   bool CanPerformCheapRaster(Tile* tile) const;
   scoped_ptr<ResourcePool::Resource> PrepareTileForRaster(Tile* tile);
   void DispatchOneRasterTask(scoped_refptr<Tile> tile);
   void PerformOneCheapRaster(Tile* tile);
   void OnRasterCompleted(
       scoped_refptr<Tile> tile,
       scoped_ptr<ResourcePool::Resource> resource,
-      int manage_tiles_call_count_when_dispatched);
+      int manage_tiles_call_count_when_dispatched,
+      TileUploadMethod upload_method);
   void OnRasterTaskCompleted(
       scoped_refptr<Tile> tile,
       scoped_ptr<ResourcePool::Resource> resource,
       int manage_tiles_call_count_when_dispatched);
   void DidFinishTileInitialization(Tile* tile);
   void DidTileRasterStateChange(Tile* tile, TileRasterState state);
   void DidTileBinChange(Tile* tile,
                         TileManagerBin bin,
                         WhichTree tree);
+  void DidCompleteTileUpload(Tile* tile);
   scoped_ptr<Value> GetMemoryRequirementsAsValue() const;
 
   static void PerformRaster(uint8* buffer,
                             const gfx::Rect& rect,
                             float contents_scale,
                             bool use_cheapness_estimator,
                             PicturePileImpl* picture_pile,
                             RenderingStats* stats);
   static void PerformImageDecode(skia::LazyPixelRef* pixel_ref,
                                  RenderingStats* stats);
@@ skipping 15 matching lines @@
 
   typedef std::list<Tile*> TileList;
   // Tiles with image decoding tasks. These tiles need to be rasterized
   // when all the image decoding tasks finish.
   TileList tiles_with_image_decoding_tasks_;
 
   typedef base::hash_map<uint32_t, skia::LazyPixelRef*> PixelRefMap;
   PixelRefMap pending_decode_tasks_;
 
   typedef std::queue<scoped_refptr<Tile> > TileQueue;
-  TileQueue tiles_with_pending_set_pixels_;
-  size_t bytes_pending_set_pixels_;
+  TileQueue tiles_with_pending_upload_;
+  size_t bytes_pending_upload_;
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   bool record_rendering_stats_;
   RenderingStats rendering_stats_;
 
   bool use_cheapness_estimator_;
   int raster_state_count_[NUM_STATES][NUM_TREES][NUM_BINS];
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_MANAGER_H_