cc: Update rasterize and record to capture more work in recording.

cc/benchmarks/rasterize_and_record_benchmark.cc

Index: cc/benchmarks/rasterize_and_record_benchmark.cc
diff --git a/cc/benchmarks/rasterize_and_record_benchmark.cc b/cc/benchmarks/rasterize_and_record_benchmark.cc
index 6314fdef87ea4538b62ecf1123793a0b0b592fbd..35451ba8ba0d1eced4bfc5d4225a13f1156b3aa8 100644
--- a/cc/benchmarks/rasterize_and_record_benchmark.cc
+++ b/cc/benchmarks/rasterize_and_record_benchmark.cc
@@ -139,6 +139,8 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) {
     return;
 
   ContentLayerClient* painter = layer->client();
+  RecordingSource recording_source;
+  recording_source.SetGenerateDiscardableImagesMetadata(true);

[vmpstr, 2017/04/27 17:41:45]

This part is going away in a patch that is currently in flight. Once that lands,
I'll remove the line and run the patch through ct first. The rest of the changes
would stay the same.

[Khushal, 2017/04/27 17:56:33]

The patch that removes this has landed. :P

 
   for (int mode_index = 0; mode_index < RecordingSource::RECORDING_MODE_COUNT;
        mode_index++) {
@@ -158,11 +160,8 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) {
 
       do {
         display_list = painter->PaintContentsToDisplayList(painting_control);
-        if (display_list->ShouldBeAnalyzedForSolidColor()) {
-          gfx::Size layer_size = layer->paint_properties().bounds;
-          skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height());
-          display_list->Raster(&canvas, nullptr, gfx::Rect(layer_size), 1.f);
-        }
+        recording_source.UpdateDisplayItemList(
+            display_list, painter->GetApproximateUnsharedMemoryUsage());
 
         if (memory_used) {
           // Verify we are recording the same thing each time.