Fixing RenderingStats vs WebRenderingStats mess

webkit/compositor_bindings/web_layer_tree_view_impl.cc

 // Copyright 2011 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 "web_layer_tree_view_impl.h"
 
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/thread.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "web_layer_impl.h"
 #include "web_to_ccinput_handler_adapter.h"
+#include "webkit/compositor_bindings/web_rendering_stats_impl.h"
 
 using namespace cc;
 
 namespace WebKit {
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(WebLayerTreeViewClient* client)
     : m_client(client)
 {
 }
 
@@ skipping 130 matching lines @@
     m_layerTreeHost->finishAllRendering();
 }
 
 void WebLayerTreeViewImpl::setDeferCommits(bool deferCommits)
 {
     m_layerTreeHost->setDeferCommits(deferCommits);
 }
 
 void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
 {
-    RenderingStats ccStats;
-    m_layerTreeHost->renderingStats(&ccStats);
-
-    stats.numAnimationFrames = ccStats.numAnimationFrames;
-    stats.numFramesSentToScreen = ccStats.numFramesSentToScreen;
-    stats.droppedFrameCount = ccStats.droppedFrameCount;
-    stats.totalPaintTimeInSeconds = ccStats.totalPaintTimeInSeconds;
-    stats.totalRasterizeTimeInSeconds = ccStats.totalRasterizeTimeInSeconds;
-    stats.totalCommitTimeInSeconds = ccStats.totalCommitTimeInSeconds;
-    stats.totalCommitCount = ccStats.totalCommitCount;
-    stats.totalPixelsPainted = ccStats.totalPixelsPainted;
-    stats.totalPixelsRasterized = ccStats.totalPixelsRasterized;
-    stats.numImplThreadScrolls = ccStats.numImplThreadScrolls;
-    stats.numMainThreadScrolls = ccStats.numMainThreadScrolls;
+    m_layerTreeHost->renderingStats(
+        &static_cast<WebRenderingStatsImpl&>(stats).rendering_stats);
 }
 
 void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
 {
     m_layerTreeHost->setShowFPSCounter(show);
 }
 
 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) {
     setFontAtlas(asciiToWebRectTable, bitmap, fontHeight);
 }
@@ skipping 75 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit