Index: cc/tile_manager.h |
diff --git a/cc/tile_manager.h b/cc/tile_manager.h |
index 631469d5c6d9a4e1b4305a03f052a3961c4005f9..9c0c2916e6101ae6328cef58c96c33bc81e0dbf4 100644 |
--- a/cc/tile_manager.h |
+++ b/cc/tile_manager.h |
@@ -26,6 +26,7 @@ class TileVersion; |
class CC_EXPORT TileManagerClient { |
public: |
virtual void ScheduleManageTiles() = 0; |
+ virtual void ScheduleCheckForCompletedRasterTasks() = 0; |
virtual void DidUploadVisibleHighResolutionTile() = 0; |
protected: |
@@ -55,7 +56,7 @@ enum TileRasterState { |
IDLE_STATE = 0, |
WAITING_FOR_RASTER_STATE = 1, |
RASTER_STATE = 2, |
- SET_PIXELS_STATE = 3, |
+ UPLOAD_STATE = 3, |
brianderson
2013/02/12 01:44:31
Is changing "set_pixels" to "upload" just a cleanu
reveman
2013/02/12 02:29:52
Yes, that's just cleanup and I'm fine moving that
|
NUM_STATES = 4 |
}; |
@@ -104,6 +105,7 @@ class CC_EXPORT TileManager { |
void SetGlobalState(const GlobalStateThatImpactsTilePriority& state); |
void ManageTiles(); |
+ void CheckForCompletedRasterTasks(); |
void CheckForCompletedTileUploads(); |
scoped_ptr<base::Value> AsValue() const; |
@@ -197,11 +199,13 @@ class CC_EXPORT TileManager { |
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_; |
bool ever_exceeded_memory_budget_; |
MemoryHistory::Entry memory_stats_from_last_assign_; |
+ size_t bytes_pending_raster_; |
+ size_t bytes_pending_upload_; |
+ |
bool record_rendering_stats_; |
RenderingStats rendering_stats_; |