| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index b93cd69710a93ffdaf5f51a93a90b75953f6fa7c..923e50dbf2ad3802ece5170445c16ac207c56d19 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -636,15 +636,21 @@ void TileManager::AnalyzeTile(Tile* tile) {
|
| }
|
|
|
| void TileManager::GatherPixelRefsForTile(Tile* tile) {
|
| + // TODO(vmpstr): Remove this function and pending_pixel_refs
|
| + // when reveman's improvements to worker pool go in.
|
| TRACE_EVENT0("cc", "TileManager::GatherPixelRefsForTile");
|
| ManagedTileState& managed_tile_state = tile->managed_state();
|
| if (managed_tile_state.need_to_gather_pixel_refs) {
|
| base::TimeTicks start_time =
|
| rendering_stats_instrumentation_->StartRecording();
|
| - tile->picture_pile()->GatherPixelRefs(
|
| - tile->content_rect_,
|
| - tile->contents_scale_,
|
| - managed_tile_state.pending_pixel_refs);
|
| + for (PicturePileImpl::PixelRefIterator pixel_ref_iter(
|
| + tile->content_rect(),
|
| + tile->contents_scale(),
|
| + tile->picture_pile());
|
| + pixel_ref_iter;
|
| + ++pixel_ref_iter) {
|
| + managed_tile_state.pending_pixel_refs.push_back(*pixel_ref_iter);
|
| + }
|
| managed_tile_state.need_to_gather_pixel_refs = false;
|
| base::TimeDelta duration =
|
| rendering_stats_instrumentation_->EndRecording(start_time);
|
| @@ -814,7 +820,6 @@ void TileManager::OnRasterTaskCompleted(
|
|
|
| // Finish resource initialization if |can_use_gpu_memory| is true.
|
| if (managed_tile_state.can_use_gpu_memory) {
|
| -
|
| // Tile resources can't be freed until upload has completed.
|
| tile->drawing_info().can_be_freed_ = false;
|
|
|
|
|