From 6668b07fcd51f86be243b9e08e667224e30c0cf8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 27 Jun 2012 09:28:46 +0200 Subject: Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325) New snapshot with more Windows build fixes --- Source/WebKit/chromium/src/WebLayerTreeView.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/src/WebLayerTreeView.cpp') diff --git a/Source/WebKit/chromium/src/WebLayerTreeView.cpp b/Source/WebKit/chromium/src/WebLayerTreeView.cpp index 356af1de2..207a8350d 100644 --- a/Source/WebKit/chromium/src/WebLayerTreeView.cpp +++ b/Source/WebKit/chromium/src/WebLayerTreeView.cpp @@ -31,10 +31,12 @@ #include "WebLayerTreeViewImpl.h" #include "cc/CCGraphicsContext.h" #include "cc/CCLayerTreeHost.h" +#include "cc/CCRenderingStats.h" #include "platform/WebLayer.h" #include "platform/WebPoint.h" #include "platform/WebRect.h" #include "platform/WebSize.h" +#include using namespace WebCore; @@ -173,9 +175,13 @@ void WebLayerTreeView::finishAllRendering() m_private->layerTreeHost()->finishAllRendering(); } -WebGraphicsContext3D* WebLayerTreeView::context() +void WebLayerTreeView::renderingStats(WebRenderingStats& stats) const { - return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_private->layerTreeHost()->context()->context3D()); + CCRenderingStats ccStats; + m_private->layerTreeHost()->renderingStats(ccStats); + + stats.numAnimationFrames = ccStats.numAnimationFrames; + stats.numFramesSentToScreen = ccStats.numFramesSentToScreen; } void WebLayerTreeView::loseCompositorContext(int numTimes) -- cgit v1.2.1