Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: content/renderer/render_widget.cc

Issue 11364221: Fixing RenderingStats vs WebRenderingStats mess (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_widget.h ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 7edaf7259d412ff6676b44dd3026c650c04ccf67..19f352b38ff4187b4f023e819772ddffe7e09f8d 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -40,6 +40,7 @@
#include "ui/gfx/skia_util.h"
#include "ui/gl/gl_switches.h"
#include "ui/surface/transport_dib.h"
+#include "webkit/compositor_bindings/web_rendering_stats_impl.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/webplugin.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -1920,15 +1921,22 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
}
}
-void RenderWidget::GetRenderingStats(WebKit::WebRenderingStats& stats) const {
+void RenderWidget::GetRenderingStats(
+ WebKit::WebRenderingStatsImpl& stats) const {
webwidget()->renderingStats(stats);
- stats.numAnimationFrames += software_stats_.numAnimationFrames;
- stats.numFramesSentToScreen += software_stats_.numFramesSentToScreen;
- stats.totalPaintTimeInSeconds += software_stats_.totalPaintTimeInSeconds;
- stats.totalPixelsPainted += software_stats_.totalPixelsPainted;
- stats.totalRasterizeTimeInSeconds +=
+
+ stats.rendering_stats.numAnimationFrames +=
+ software_stats_.numAnimationFrames;
+ stats.rendering_stats.numFramesSentToScreen +=
+ software_stats_.numFramesSentToScreen;
+ stats.rendering_stats.totalPaintTimeInSeconds +=
+ software_stats_.totalPaintTimeInSeconds;
+ stats.rendering_stats.totalPixelsPainted +=
+ software_stats_.totalPixelsPainted;
+ stats.rendering_stats.totalRasterizeTimeInSeconds +=
software_stats_.totalRasterizeTimeInSeconds;
- stats.totalPixelsRasterized += software_stats_.totalPixelsRasterized;
+ stats.rendering_stats.totalPixelsRasterized +=
+ software_stats_.totalPixelsRasterized;
}
bool RenderWidget::GetGpuRenderingStats(GpuRenderingStats* stats) const {
« no previous file with comments | « content/renderer/render_widget.h ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698