telemetry: Refactored rasterize_and_record measurement.

cc/resources/picture_pile_impl.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 <algorithm>
 #include <limits>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/region.h"
-#include "cc/debug/benchmark_instrumentation.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
@@ skipping 173 matching lines @@
           "Contents scale: " << contents_scale;
 
       content_clip.Intersect(canvas_rect);
 
       if (!unclipped.Intersects(content_clip))
         continue;
 
       base::TimeDelta best_duration =
           base::TimeDelta::FromInternalValue(std::numeric_limits<int64>::max());
       int repeat_count = std::max(1, slow_down_raster_scale_factor_for_debug_);
+      int rasterized_pixel_count = 0;
 
-      TRACE_EVENT0(benchmark_instrumentation::kCategory,
-                   benchmark_instrumentation::kRasterLoop);
       for (int j = 0; j < repeat_count; ++j) {
         base::TimeTicks start_time;
         if (rendering_stats_instrumentation)
           start_time = rendering_stats_instrumentation->StartRecording();
-        (*i)->Raster(canvas, callback, content_clip, contents_scale);
+        rasterized_pixel_count =
+            (*i)->Raster(canvas, callback, content_clip, contents_scale);
         if (rendering_stats_instrumentation) {
           base::TimeDelta duration =
               rendering_stats_instrumentation->EndRecording(start_time);
           best_duration = std::min(best_duration, duration);
         }
       }
       if (rendering_stats_instrumentation) {
-        int64 rasterized_pixel_count =
-            repeat_count * content_clip.width() * content_clip.height();
         rendering_stats_instrumentation->AddRaster(best_duration,
                                                    rasterized_pixel_count);
       }
 
       if (show_debug_picture_borders_) {
         gfx::Rect border = gfx::ScaleToEnclosedRect(
              (*i)->LayerRect(), contents_scale);
         border.Inset(0, 0, 1, 1);
 
         SkPaint picture_border_paint;
@@ skipping 149 matching lines @@
     PictureList& picture_list = (*pli).second;
     for (PictureList::iterator picture = picture_list.begin();
          picture != picture_list.end();
          picture++) {
       (*picture)->EmitTraceSnapshot();
     }
   }
 }
 
 }  // namespace cc