cc: Improve frame/commit accounting

content/renderer/render_widget.cc

 // Copyright (c) 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 "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 907 matching lines @@
     }
 
     // Calculate filtered time per frame:
     float frame_time_elapsed = static_cast<float>(delay.InSecondsF());
     filtered_time_per_frame_ =
         0.9f * filtered_time_per_frame_ + 0.1f * frame_time_elapsed;
   }
   last_do_deferred_update_time_ = frame_begin_ticks;
 
   if (!is_accelerated_compositing_active_) {
-    software_stats_.numAnimationFrames++;
-    software_stats_.numFramesSentToScreen++;
+    software_stats_.mainAnimationFrameCount++;
+    software_stats_.compositorFrameCount++;
   }
 
   // OK, save the pending update to a local since painting may cause more
   // invalidation.  Some WebCore rendering objects only layout when painted.
   PaintAggregator::PendingUpdate update;
   paint_aggregator_.PopPendingUpdate(&update);
 
   gfx::Rect scroll_damage = update.GetScrollDamage();
   gfx::Rect bounds = update.GetPaintBounds().Union(scroll_damage);
 
@@ skipping 913 matching lines @@
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }
 
 void RenderWidget::GetRenderingStats(WebKit::WebRenderingStats& stats) const {
   webwidget()->renderingStats(stats);
-  stats.numAnimationFrames += software_stats_.numAnimationFrames;
-  stats.numFramesSentToScreen += software_stats_.numFramesSentToScreen;
+  stats.mainAnimationFrameCount += software_stats_.mainAnimationFrameCount;
+  stats.compositorFrameCount += software_stats_.compositorFrameCount;
   stats.totalPaintTimeInSeconds += software_stats_.totalPaintTimeInSeconds;
 }
 
 bool RenderWidget::GetGpuRenderingStats(
     content::GpuRenderingStats* stats) const {
   GpuChannelHost* gpu_channel = RenderThreadImpl::current()->GetGpuChannel();
   if (!gpu_channel)
     return false;
 
   return gpu_channel->CollectRenderingStatsForSurface(surface_id(), stats);
 }
 
 void RenderWidget::BeginSmoothScroll(
     bool down,
     bool scroll_far,
     const SmoothScrollCompletionCallback& callback) {
   DCHECK(!callback.is_null());
   int id = next_smooth_scroll_gesture_id_++;
   Send(new ViewHostMsg_BeginSmoothScroll(routing_id_, id, down, scroll_far));
   pending_smooth_scroll_gestures_.insert(std::make_pair(id, callback));
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }