Fixing RenderingStats vs WebRenderingStats mess

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 28d961d7ecf4f529008b61d6e1d838593d449a92..92c53bee03490bac443fa0fd0b864b9ced40221e 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "cc/rendering_stats.h"
 #include "content/common/content_export.h"
 #include "content/renderer/paint_aggregator.h"
 #include "ipc/ipc_listener.h"
@@ -41,6 +42,10 @@ namespace IPC {
 class SyncMessage;
 }
 
+namespace cc {
+struct RenderingStats;
+}

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

Don't think you need to forward declare this if you're including the header.

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

Done.

+
 namespace WebKit {
 class WebGestureEvent;
 class WebMouseEvent;
@@ -155,7 +160,11 @@ class CONTENT_EXPORT RenderWidget
   // rendering, e.g. count of frames rendered, time spent painting.
   // This call is relatively expensive in threaded compositing mode,
   // as it blocks on the compositor thread.
+#ifdef NOT_USING_WEB_RENDERING_STATS
+  void GetRenderingStats(cc::RenderingStats&) const;
+#else
   void GetRenderingStats(WebKit::WebRenderingStats&) const;
+#endif  // NOT_USING_WEB_RENDERING_STATS
 
   // Fills in a GpuRenderingStats struct containing information about
   // GPU rendering, e.g. count of texture uploads performed, time spent
@@ -592,7 +601,11 @@ class CONTENT_EXPORT RenderWidget
   bool has_disable_gpu_vsync_switch_;
   base::TimeTicks last_do_deferred_update_time_;
 
+#ifdef NOT_USING_WEB_RENDERING_STATS
+  cc::RenderingStats software_stats_;
+#else
   WebKit::WebRenderingStats software_stats_;
+#endif  // NOT_USING_WEB_RENDERING_STATS
 
   // UpdateRect parameters for the current compositing pass. This is used to
   // pass state between DoDeferredUpdate and OnSwapBuffersPosted.