Fixing RenderingStats vs WebRenderingStats mess

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 7edaf7259d412ff6676b44dd3026c650c04ccf67..95263bcd19601c3be730b054b9fcce893e13261b 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -14,6 +14,7 @@
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "cc/rendering_stats.h"

[Ian Vollick, 2012/11/13 21:26:06]

Already included in the header.

[hartmanng, 2012/11/13 21:42:53]

Done.

 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
@@ -1920,8 +1921,13 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   }
 }
 
+#ifdef NOT_USING_WEB_RENDERING_STATS
+void RenderWidget::GetRenderingStats(cc::RenderingStats& stats) const {
+  webwidget()->renderingStats(&stats);
+#else
 void RenderWidget::GetRenderingStats(WebKit::WebRenderingStats& stats) const {
   webwidget()->renderingStats(stats);
+#endif  // NOT_USING_WEB_RENDERING_STATS
   stats.numAnimationFrames += software_stats_.numAnimationFrames;
   stats.numFramesSentToScreen += software_stats_.numFramesSentToScreen;
   stats.totalPaintTimeInSeconds += software_stats_.totalPaintTimeInSeconds;