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

cc/benchmarks/rasterize_and_record_benchmark.cc

 // Copyright 2013 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/benchmarks/rasterize_and_record_benchmark.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 121 matching lines @@
                  weak_ptr_factory_.GetWeakPtr())));
 }
 
 void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) {
   DCHECK(layer_tree_host_);
 
   if (!layer->DrawsContent())
     return;
 
   ContentLayerClient* painter = layer->client();
+  RecordingSource recording_source;
 
   for (int mode_index = 0; mode_index < RecordingSource::RECORDING_MODE_COUNT;
        mode_index++) {
     ContentLayerClient::PaintingControlSetting painting_control =
         RecordingModeToPaintingControlSetting(
             static_cast<RecordingSource::RecordingMode>(mode_index));
     base::TimeDelta min_time = base::TimeDelta::Max();
     size_t memory_used = 0;
 
     scoped_refptr<DisplayItemList> display_list;
     for (int i = 0; i < record_repeat_count_; ++i) {
       // Run for a minimum amount of time to avoid problems with timer
       // quantization when the layer is very small.
       LapTimer timer(kWarmupRuns,
                      base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                      kTimeCheckInterval);
 
       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.
           DCHECK_EQ(memory_used, display_list->ApproximateMemoryUsage());
         } else {
           memory_used = display_list->ApproximateMemoryUsage();
         }
 
         timer.NextLap();
       } while (!timer.HasTimeLimitExpired());
@@ skipping 12 matching lines @@
     record_results_.total_best_time[mode_index] += min_time;
   }
 }
 
 RasterizeAndRecordBenchmark::RecordResults::RecordResults()
     : pixels_recorded(0), bytes_used(0) {}
 
 RasterizeAndRecordBenchmark::RecordResults::~RecordResults() {}
 
 }  // namespace cc