cc: Reland "Add UMA stats for record and raster time."

cc/playback/display_list_recording_source.cc

 // Copyright 2014 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/playback/display_list_recording_source.h"
 
 #include <algorithm>
 
+#include "cc/base/histograms.h"
 #include "cc/base/region.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "skia/ext/analysis_canvas.h"
 
 namespace {
 
 // Layout pixel buffer around the visible layer rect to record.  Any base
 // picture that intersects the visible layer rect expanded by this distance
 // will be recorded.
 const int kPixelDistanceToRecord = 8000;
 // We don't perform solid color analysis on images that have more than 10 skia
 // operations.
 const int kOpCountThatIsOkToAnalyze = 10;
 
+DEFINE_SCOPED_UMA_HISTOGRAM_AREA_TIMER(
+    ScopedDisplayListRecordingSourceUpdateTimer,
+    "Compositing.DisplayListRecordingSource.UpdateUs",
+    "Compositing.DisplayListRecordingSource.UpdateInvalidatedAreaPerMs");
+
 }  // namespace
 
 namespace cc {
 
 DisplayListRecordingSource::DisplayListRecordingSource(
     const gfx::Size& grid_cell_size,
     bool use_cached_picture)
     : use_cached_picture_(use_cached_picture),
       slow_down_raster_scale_factor_for_debug_(0),
       gather_pixel_refs_(false),
       requires_clear_(false),
       is_solid_color_(false),
       solid_color_(SK_ColorTRANSPARENT),
       background_color_(SK_ColorTRANSPARENT),
       pixel_record_distance_(kPixelDistanceToRecord),
       grid_cell_size_(grid_cell_size),
       is_suitable_for_gpu_rasterization_(true) {
 }
 
 DisplayListRecordingSource::~DisplayListRecordingSource() {
 }
 
 bool DisplayListRecordingSource::UpdateAndExpandInvalidation(
     ContentLayerClient* painter,
     Region* invalidation,
     const gfx::Size& layer_size,
     const gfx::Rect& visible_layer_rect,
     int frame_number,
     RecordingMode recording_mode) {
+  ScopedDisplayListRecordingSourceUpdateTimer timer;
   bool updated = false;
 
   if (size_ != layer_size) {
     size_ = layer_size;
     updated = true;
   }
 
   gfx::Rect old_recorded_viewport = recorded_viewport_;
   recorded_viewport_ = visible_layer_rect;
   recorded_viewport_.Inset(-pixel_record_distance_, -pixel_record_distance_);
   recorded_viewport_.Intersect(gfx::Rect(GetSize()));
 
   if (recorded_viewport_ != old_recorded_viewport) {
     // Invalidate newly-exposed and no-longer-exposed areas.
     Region newly_exposed_region(recorded_viewport_);
     newly_exposed_region.Subtract(old_recorded_viewport);
     invalidation->Union(newly_exposed_region);
 
     Region no_longer_exposed_region(old_recorded_viewport);
     no_longer_exposed_region.Subtract(recorded_viewport_);
     invalidation->Union(no_longer_exposed_region);
 
     updated = true;
   }
 
+  // Count the area that is being invalidated.
+  Region recorded_invalidation(*invalidation);
+  recorded_invalidation.Intersect(recorded_viewport_);
+  for (Region::Iterator it(recorded_invalidation); it.has_rect(); it.next())
+    timer.AddArea(it.rect().size().GetArea());
+
   if (!updated && !invalidation->Intersects(recorded_viewport_))
     return false;
 
   ContentLayerClient::PaintingControlSetting painting_control =
       ContentLayerClient::PAINTING_BEHAVIOR_NORMAL;
 
   switch (recording_mode) {
     case RECORD_NORMALLY:
       // Already setup for normal recording.
       break;
@@ skipping 94 matching lines @@
   is_solid_color_ = canvas.GetColorIfSolid(&solid_color_);
 }
 
 void DisplayListRecordingSource::Clear() {
   recorded_viewport_ = gfx::Rect();
   display_list_ = NULL;
   is_solid_color_ = false;
 }
 
 }  // namespace cc