telemetry: Refactored rasterize_and_record measurement.

cc/resources/raster_worker_pool.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/resources/raster_worker_pool.h"
 
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
-#include "cc/debug/benchmark_instrumentation.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/lazy_pixel_ref.h"
 #include "skia/ext/paint_simplifier.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
 
 namespace {
@@ skipping 75 matching lines @@
 
     // Clear the flag if we're not using the estimator.
     analysis_.is_solid_color &= kUseColorEstimator;
   }
 
   bool RunRasterOnThread(unsigned thread_index,
                          void* buffer,
                          gfx::Size size,
                          int stride) {
     TRACE_EVENT2(
-        benchmark_instrumentation::kCategory,
-        benchmark_instrumentation::kRunRasterOnThread,
-        benchmark_instrumentation::kData,
+        "cc", "RasterWorkerPoolTaskImpl::RunRasterOnThread",
+        "data",
         TracedValue::FromValue(DataAsValue().release()),
         "raster_mode",
         TracedValue::FromValue(RasterModeAsValue(raster_mode_).release()));
 
     devtools_instrumentation::ScopedLayerTask raster_task(
         devtools_instrumentation::kRasterTask, layer_id_);
 
     DCHECK(picture_pile_.get());
     DCHECK(buffer);
 
@@ skipping 40 matching lines @@
       case HIGH_QUALITY_RASTER_MODE:
         break;
       case NUM_RASTER_MODES:
       default:
         NOTREACHED();
     }
 
     canvas.setDrawFilter(draw_filter.get());
 
     base::TimeDelta prev_rasterize_time =
-        rendering_stats_->GetImplThreadRenderingStats().rasterize_time;
+        rendering_stats_->impl_thread_rendering_stats().rasterize_time;
 
-    picture_clone->RasterToBitmap(
-        &canvas, content_rect_, contents_scale_, rendering_stats_);
+    // Only record rasterization time for highres tiles, because
+    // lowres tiles are not required for activation and therefore
+    // introduce noise in the measurement (sometimes they get rasterized
+    // before we draw and sometimes they aren't)
+    if (tile_resolution_ == HIGH_RESOLUTION) {
+      picture_clone->RasterToBitmap(
+          &canvas, content_rect_, contents_scale_, rendering_stats_);
+    } else {
+      picture_clone->RasterToBitmap(
+          &canvas, content_rect_, contents_scale_, NULL);
+    }
 
     if (rendering_stats_->record_rendering_stats()) {
       base::TimeDelta current_rasterize_time =
-          rendering_stats_->GetImplThreadRenderingStats().rasterize_time;
+          rendering_stats_->impl_thread_rendering_stats().rasterize_time;
       HISTOGRAM_CUSTOM_COUNTS(
           "Renderer4.PictureRasterTimeUS",
           (current_rasterize_time - prev_rasterize_time).InMicroseconds(),
           0,
           100000,
           100);
     }
 
     ChangeBitmapConfigIfNeeded(bitmap, buffer);
 
@@ skipping 392 matching lines @@
 
     internal::GraphNode* decode_node = CreateGraphNodeForTask(
         decode_task, priority, graph);
     decode_node->add_dependent(raster_node);
   }
 
   return raster_node;
 }
 
 }  // namespace cc