cc: More consistent reasoning about display list memory usage.

cc/debug/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/debug/rasterize_and_record_benchmark.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 205 matching lines @@
       LapTimer timer(kWarmupRuns,
                      base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                      kTimeCheckInterval);
 
       do {
         display_list = painter->PaintContentsToDisplayList(visible_layer_rect,
                                                            painting_control);
 
         if (memory_used) {
           // Verify we are recording the same thing each time.
-          DCHECK(memory_used == display_list->PictureMemoryUsage());
+          DCHECK(memory_used == display_list->ApproximateMemoryUsage());

[enne (OOO), 2015/07/07 21:12:37]

DCHECK_EQ?

[jbroman, 2015/07/07 21:39:03]

Haha, the hazards of modifying an existing line of code. Done.

         } else {
-          memory_used = display_list->PictureMemoryUsage();
+          memory_used = display_list->ApproximateMemoryUsage();
         }
 
         timer.NextLap();
       } while (!timer.HasTimeLimitExpired());
       base::TimeDelta duration =
           base::TimeDelta::FromMillisecondsD(timer.MsPerLap());
       if (duration < min_time)
         min_time = duration;
     }
 
     if (mode_index == RecordingSource::RECORD_NORMALLY) {
       record_results_.bytes_used += memory_used;
       record_results_.pixels_recorded +=
           visible_layer_rect.width() * visible_layer_rect.height();
     }
     record_results_.total_best_time[mode_index] += min_time;
   }
 }
 
 RasterizeAndRecordBenchmark::RecordResults::RecordResults()
     : pixels_recorded(0), bytes_used(0) {
 }
 
 RasterizeAndRecordBenchmark::RecordResults::~RecordResults() {}
 
 }  // namespace cc