cc: Do GatherPixelRefs from skia at record time

cc/resources/tile_manager.cc

 // 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.
 
 #include "cc/resources/tile_manager.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 623 matching lines @@
     }
   }
 }
 
 void TileManager::GatherPixelRefsForTile(Tile* tile) {
   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::LazyPixelRefIterator 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);

[reveman, 2013/04/23 14:33:24]

please add a TODO about removing GatherPixelRefsForTile and
|pending_pixel_refs|.

[vmpstr, 2013/04/23 20:02:23]

Done.

+      ++pixel_ref_iter;

[reveman, 2013/04/23 14:33:24]

you're already incrementing iterator in the "for" statement.

[vmpstr, 2013/04/23 20:02:23]

That's a pretty big whoops. Thanks for catching it.

+    }
     managed_tile_state.need_to_gather_pixel_refs = false;
     base::TimeDelta duration =
         rendering_stats_instrumentation_->EndRecording(start_time);
     rendering_stats_instrumentation_->AddImageGathering(duration);
   }
 }
 
 void TileManager::DispatchImageDecodeTasksForTile(Tile* tile) {
   GatherPixelRefsForTile(tile);
   std::list<skia::LazyPixelRef*>& pending_pixel_refs =
@@ skipping 149 matching lines @@
   // of this could be that this tile is no longer allowed to use gpu
   // memory and in that case we need to abort initialization and free all
   // associated resources before calling DispatchMoreTasks().
   if (manage_tiles_call_count_when_dispatched != manage_tiles_call_count_)
     AssignGpuMemoryToTiles();
 
   ManagedTileState& managed_tile_state = tile->managed_state();
 
   // 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;
 
     resource_pool_->resource_provider()->BeginSetPixels(resource->id());
     has_performed_uploads_since_last_flush_ = true;
 
     tile->drawing_info().resource_ = resource.Pass();
 
     bytes_pending_upload_ += tile->bytes_consumed_if_allocated();
     tiles_with_pending_upload_.push(tile);
@@ skipping 148 matching lines @@
     skia::LazyPixelRef* pixel_ref,
     RenderingStatsInstrumentation* stats_instrumentation) {
   TRACE_EVENT0("cc", "TileManager::RunImageDecodeTask");
   base::TimeTicks start_time = stats_instrumentation->StartRecording();
   pixel_ref->Decode();
   base::TimeDelta duration = stats_instrumentation->EndRecording(start_time);
   stats_instrumentation->AddDeferredImageDecode(duration);
 }
 
 }  // namespace cc