cc: Chromify rendering_stats

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 425d943e846afe23eeee68090ece402399309bd5..68182add57dd5d7c32af65209ea8425f4cb4773b 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -890,7 +890,7 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
       base::TimeDelta paint_time =
           base::TimeTicks::HighResNow() - paint_begin_ticks;
       if (!is_accelerated_compositing_active_)
-        software_stats_.totalPaintTime += paint_time;
+        software_stats_.total_paint_time += paint_time;
     }
   } else {
     // Normal painting case.
@@ -904,7 +904,7 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
       base::TimeDelta paint_time =
           base::TimeTicks::HighResNow() - paint_begin_ticks;
       if (!is_accelerated_compositing_active_)
-        software_stats_.totalPaintTime += paint_time;
+        software_stats_.total_paint_time += paint_time;
     }
 
     // Flush to underlying bitmap.  TODO(darin): is this needed?
@@ -916,8 +916,8 @@ void RenderWidget::PaintRect(const gfx::Rect& rect,
 
   if (kEnableGpuBenchmarking) {
     int64 num_pixels_processed = rect.width() * rect.height();
-    software_stats_.totalPixelsPainted += num_pixels_processed;
-    software_stats_.totalPixelsRasterized += num_pixels_processed;
+    software_stats_.total_pixels_painted += num_pixels_processed;
+    software_stats_.total_pixels_rasterized += num_pixels_processed;
   }
 }
 
@@ -1121,8 +1121,8 @@ void RenderWidget::DoDeferredUpdate() {
   last_do_deferred_update_time_ = frame_begin_ticks;
 
   if (!is_accelerated_compositing_active_) {
-    software_stats_.numAnimationFrames++;
-    software_stats_.numFramesSentToScreen++;
+    software_stats_.animation_frame_count++;
+    software_stats_.screen_frame_count++;
   }
 
   // OK, save the pending update to a local since painting may cause more
@@ -2189,18 +2189,18 @@ void RenderWidget::GetRenderingStats(
   if (compositor_)
     compositor_->GetRenderingStats(&stats.rendering_stats);
 
-  stats.rendering_stats.numAnimationFrames +=
-      software_stats_.numAnimationFrames;
-  stats.rendering_stats.numFramesSentToScreen +=
-      software_stats_.numFramesSentToScreen;
-  stats.rendering_stats.totalPaintTime +=
-      software_stats_.totalPaintTime;
-  stats.rendering_stats.totalPixelsPainted +=
-      software_stats_.totalPixelsPainted;
-  stats.rendering_stats.totalRasterizeTime +=
-      software_stats_.totalRasterizeTime;
-  stats.rendering_stats.totalPixelsRasterized +=
-      software_stats_.totalPixelsRasterized;
+  stats.rendering_stats.animation_frame_count +=
+      software_stats_.animation_frame_count;
+  stats.rendering_stats.screen_frame_count +=
+      software_stats_.screen_frame_count;
+  stats.rendering_stats.total_paint_time +=
+      software_stats_.total_paint_time;
+  stats.rendering_stats.total_pixels_painted +=
+      software_stats_.total_pixels_painted;
+  stats.rendering_stats.total_rasterize_time +=
+      software_stats_.total_rasterize_time;
+  stats.rendering_stats.total_pixels_rasterized +=
+      software_stats_.total_pixels_rasterized;
 }
 
 bool RenderWidget::GetGpuRenderingStats(GpuRenderingStats* stats) const {