Index: cc/tiles/tile_manager.h |
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h |
index 5de0a15485a61a511906fa1552354f07d906643d..50979e6792fbb94f00109b6ce9fcf6cc81136c6a 100644 |
--- a/cc/tiles/tile_manager.h |
+++ b/cc/tiles/tile_manager.h |
@@ -164,10 +164,12 @@ class CC_EXPORT TileManager : CheckerImageTrackerClient { |
void InitializeTilesWithResourcesForTesting(const std::vector<Tile*>& tiles) { |
for (size_t i = 0; i < tiles.size(); ++i) { |
TileDrawInfo& draw_info = tiles[i]->draw_info(); |
- draw_info.set_resource(resource_pool_->AcquireResource( |
- tiles[i]->desired_texture_size(), |
- raster_buffer_provider_->GetResourceFormat(false), |
- client_->GetRasterColorSpace())); |
+ draw_info.set_resource( |
+ resource_pool_->AcquireResource( |
+ tiles[i]->desired_texture_size(), |
+ raster_buffer_provider_->GetResourceFormat(false), |
+ client_->GetRasterColorSpace()), |
+ false); |
draw_info.set_resource_ready_for_draw(); |
} |
} |
@@ -276,13 +278,15 @@ class CC_EXPORT TileManager : CheckerImageTrackerClient { |
std::vector<PrioritizedTile> tiles_to_raster; |
std::vector<PrioritizedTile> tiles_to_process_for_images; |
+ CheckerImageTracker::ImageDecodeQueue checker_image_decode_queue; |
}; |
void FreeResourcesForTile(Tile* tile); |
void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile); |
scoped_refptr<TileTask> CreateRasterTask( |
const PrioritizedTile& prioritized_tile, |
- const gfx::ColorSpace& color_space); |
+ const gfx::ColorSpace& color_space, |
+ CheckerImageTracker::ImageDecodeQueue* checker_image_decode_queue); |
std::unique_ptr<EvictionTilePriorityQueue> |
FreeTileResourcesUntilUsageIsWithinLimit( |
@@ -314,6 +318,8 @@ class CC_EXPORT TileManager : CheckerImageTrackerClient { |
PrioritizedWorkToSchedule AssignGpuMemoryToTiles(); |
void ScheduleTasks(const PrioritizedWorkToSchedule& work_to_schedule); |
+ void EnsureImageAnalysisPerformed(const PrioritizedTile& prioritized_tile); |
+ |
std::unique_ptr<base::trace_event::ConvertableToTraceFormat> |
ScheduledTasksStateAsValue() const; |