Fixing RenderingStats vs WebRenderingStats mess

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "ipc/ipc_sender.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/webcursor.h"
 
 struct ViewHostMsg_UpdateRect_Params;
 class ViewHostMsg_UpdateRect;
 
 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;
 class WebTouchEvent;
 }
 
 namespace skia {
 class PlatformCanvas;
 }
 
@@ skipping 94 matching lines @@
   void SchedulePluginMove(const webkit::npapi::WebPluginGeometry& move);
 
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
   void CleanupWindowInPluginMoves(gfx::PluginWindowHandle window);
 
   // Fills in a WebRenderingStats struct containing information about
   // 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
   // uploading.
   // This call is relatively expensive as it blocks on the GPU process
   bool GetGpuRenderingStats(GpuRenderingStats*) const;
 
   // Callback for use with BeginSmoothScroll.
   typedef base::Callback<void()> SmoothScrollCompletionCallback;
 
@@ skipping 416 matching lines @@
   bool is_accelerated_compositing_active_;
 
   base::OneShotTimer<RenderWidget> animation_timer_;
   base::Time animation_floor_time_;
   bool animation_update_pending_;
   bool invalidation_task_posted_;
 
   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.
   scoped_ptr<ViewHostMsg_UpdateRect_Params> pending_update_params_;
 
   // Queue of UpdateRect messages corresponding to a SwapBuffers. We want to
   // delay sending of UpdateRect until the corresponding SwapBuffers has been
   // executed. Since we can have several in flight, we need to keep them in a
   // queue. Note: some SwapBuffers may not correspond to an update, in which
   // case NULL is added to the queue.
@@ skipping 17 matching lines @@
 
   // Specified whether the compositor will run in its own thread.
   bool is_threaded_compositing_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_