Diff
Modified: trunk/Source/Platform/ChangeLog (121068 => 121069)
--- trunk/Source/Platform/ChangeLog 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/Platform/ChangeLog 2012-06-22 23:16:51 UTC (rev 121069)
@@ -1,3 +1,17 @@
+2012-06-22 Kenneth Russell <[email protected]>
+
+ Unreviewed, rolling out r121064.
+ http://trac.webkit.org/changeset/121064
+ https://bugs.webkit.org/show_bug.cgi?id=88268
+
+ Broke Chromium Mac build.
+
+ * Platform.gypi:
+ * chromium/public/WebLayerTreeView.h:
+ (WebKit):
+ (WebLayerTreeView):
+ * chromium/public/WebRenderingStats.h: Removed.
+
2012-06-22 Dave Tu <[email protected]>
[chromium] Expose rendering statistics to WebWidget.
Modified: trunk/Source/Platform/Platform.gypi (121068 => 121069)
--- trunk/Source/Platform/Platform.gypi 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/Platform/Platform.gypi 2012-06-22 23:16:51 UTC (rev 121069)
@@ -94,7 +94,6 @@
'chromium/public/WebPrivatePtr.h',
'chromium/public/WebRect.h',
'chromium/public/WebReferrerPolicy.h',
- 'chromium/public/WebRenderingStats.h',
'chromium/public/WebSessionDescriptionDescriptor.h',
'chromium/public/WebSize.h',
'chromium/public/WebSocketStreamError.h',
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (121068 => 121069)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -44,7 +44,6 @@
class WebLayerTreeViewImpl;
struct WebPoint;
struct WebRect;
-struct WebRenderingStats;
class WebLayerTreeView : public WebNonCopyable {
public:
@@ -174,10 +173,6 @@
// Debugging / dangerous ---------------------------------------------
- // Fills in a WebRenderingStats struct containing information about the state of the compositor.
- // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
- WEBKIT_EXPORT void renderingStats(WebRenderingStats&) const;
-
// Simulates a lost context. For testing only.
WEBKIT_EXPORT void loseCompositorContext(int numTimes);
Deleted: trunk/Source/Platform/chromium/public/WebRenderingStats.h (121068 => 121069)
--- trunk/Source/Platform/chromium/public/WebRenderingStats.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/Platform/chromium/public/WebRenderingStats.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebRenderingStats_h
-#define WebRenderingStats_h
-
-namespace WebKit {
-
-struct WebRenderingStats {
- int numAnimationFrames;
- int numFramesSentToScreen;
-
- WebRenderingStats()
- : numAnimationFrames(0)
- , numFramesSentToScreen(0)
- {
- }
-};
-
-} // namespace WebKit
-
-#endif // WebRenderingStats_h
Modified: trunk/Source/WebCore/ChangeLog (121068 => 121069)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 23:16:51 UTC (rev 121069)
@@ -1,3 +1,35 @@
+2012-06-22 Kenneth Russell <[email protected]>
+
+ Unreviewed, rolling out r121064.
+ http://trac.webkit.org/changeset/121064
+ https://bugs.webkit.org/show_bug.cgi?id=88268
+
+ Broke Chromium Mac build.
+
+ * WebCore.gypi:
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::CCLayerTreeHost):
+ (WebCore::CCLayerTreeHost::updateAnimations):
+ (WebCore::CCLayerTreeHost::finishCommitOnImplThread):
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+ (WebCore):
+ (WebCore::CCLayerTreeHost::frameNumber):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::CCLayerTreeHostImpl):
+ (WebCore::CCLayerTreeHostImpl::drawLayers):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+ (WebCore::CCLayerTreeHostImpl::frameNumber):
+ (CCLayerTreeHostImpl):
+ * platform/graphics/chromium/cc/CCProxy.h:
+ (WebCore):
+ (CCProxy):
+ * platform/graphics/chromium/cc/CCRenderingStats.h: Removed.
+ * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+ * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ * platform/graphics/chromium/cc/CCThreadProxy.h:
+ (CCThreadProxy):
+
2012-06-22 Ryuan Choi <[email protected]>
[EFL][WK2] Support keyboard event
Modified: trunk/Source/WebCore/WebCore.gypi (121068 => 121069)
--- trunk/Source/WebCore/WebCore.gypi 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/WebCore.gypi 2012-06-22 23:16:51 UTC (rev 121069)
@@ -3751,7 +3751,6 @@
'platform/graphics/chromium/cc/CCProxy.h',
'platform/graphics/chromium/cc/CCQuadCuller.cpp',
'platform/graphics/chromium/cc/CCQuadCuller.h',
- 'platform/graphics/chromium/cc/CCRenderingStats.h',
'platform/graphics/chromium/cc/CCRenderPass.cpp',
'platform/graphics/chromium/cc/CCRenderPass.h',
'platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp',
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -39,7 +39,6 @@
#include "cc/CCLayerTreeHostImpl.h"
#include "cc/CCOcclusionTracker.h"
#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCRenderingStats.h"
#include "cc/CCSettings.h"
#include "cc/CCSingleThreadProxy.h"
#include "cc/CCThreadProxy.h"
@@ -73,8 +72,7 @@
, m_animating(false)
, m_needsAnimateLayers(false)
, m_client(client)
- , m_animationFrameNumber(0)
- , m_commitNumber(0)
+ , m_frameNumber(0)
, m_frameIsForDisplay(false)
, m_layerRendererInitialized(false)
, m_contextLost(false)
@@ -221,8 +219,6 @@
m_client->updateAnimations(monotonicFrameBeginTime);
animateLayers(monotonicFrameBeginTime);
m_animating = false;
-
- m_animationFrameNumber++;
}
void CCLayerTreeHost::layout()
@@ -255,7 +251,7 @@
if (rootLayer() && m_needsAnimateLayers)
hostImpl->setNeedsAnimateLayers();
- hostImpl->setSourceFrameNumber(commitNumber());
+ hostImpl->setSourceFrameNumber(frameNumber());
hostImpl->setViewportSize(viewportSize());
hostImpl->setDeviceScaleFactor(deviceScaleFactor());
hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
@@ -264,7 +260,7 @@
hostImpl->setVisible(m_visible);
hostImpl->setSourceFrameCanBeDrawn(m_frameIsForDisplay);
- m_commitNumber++;
+ m_frameNumber++;
}
void CCLayerTreeHost::commitComplete()
@@ -317,12 +313,6 @@
m_proxy->finishAllRendering();
}
-void CCLayerTreeHost::renderingStats(CCRenderingStats& stats) const
-{
- m_proxy->implSideRenderingStats(stats);
- stats.numAnimationFrames = animationFrameNumber();
-}
-
const LayerRendererCapabilities& CCLayerTreeHost::layerRendererCapabilities() const
{
return m_proxy->layerRendererCapabilities();
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -46,7 +46,6 @@
class CCLayerChromium;
class CCLayerTreeHostImpl;
class CCLayerTreeHostImplClient;
-class CCRenderingStats;
struct CCScrollAndScaleSet;
class CCTextureUpdater;
class ManagedTexture;
@@ -193,12 +192,8 @@
void finishAllRendering();
- int animationFrameNumber() const { return m_animationFrameNumber; }
+ int frameNumber() const { return m_frameNumber; }
- int commitNumber() const { return m_commitNumber; }
-
- void renderingStats(CCRenderingStats&) const;
-
const LayerRendererCapabilities& layerRendererCapabilities() const;
// Test only hook
@@ -285,8 +280,7 @@
CCLayerTreeHostClient* m_client;
- int m_animationFrameNumber;
- int m_commitNumber;
+ int m_frameNumber;
bool m_frameIsForDisplay;
OwnPtr<CCProxy> m_proxy;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -113,7 +113,7 @@
CCLayerTreeHostImpl::CCLayerTreeHostImpl(const CCLayerTreeSettings& settings, CCLayerTreeHostImplClient* client)
: m_client(client)
, m_sourceFrameNumber(-1)
- , m_sourceAnimationFrameNumber(0)
+ , m_frameNumber(0)
, m_rootScrollLayerImpl(0)
, m_currentlyScrollingLayerImpl(0)
, m_scrollingLayerIdFromPreviousTree(-1)
@@ -505,7 +505,7 @@
m_layerRenderer->finishDrawingFrame();
- ++m_sourceAnimationFrameNumber;
+ ++m_frameNumber;
// The next frame should start by assuming nothing has changed, and changes are noted as they occur.
m_rootLayerImpl->resetAllChangeTrackingForSubtree();
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -119,7 +119,7 @@
void setFontAtlas(PassOwnPtr<CCFontAtlas>);
void finishAllRendering();
- int sourceAnimationFrameNumber() const { return m_sourceAnimationFrameNumber; }
+ int frameNumber() const { return m_frameNumber; }
bool initializeLayerRenderer(PassRefPtr<CCGraphicsContext>, TextureUploaderOption);
bool isContextLost();
@@ -196,7 +196,7 @@
CCLayerTreeHostImplClient* m_client;
int m_sourceFrameNumber;
- int m_sourceAnimationFrameNumber;
+ int m_frameNumber;
private:
void computeDoubleTapZoomDeltas(CCScrollAndScaleSet* scrollInfo);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -34,7 +34,6 @@
namespace WebCore {
class CCFontAtlas;
-class CCRenderingStats;
class CCThread;
class CCGraphicsContext;
struct LayerRendererCapabilities;
@@ -80,8 +79,6 @@
virtual int compositorIdentifier() const = 0;
- virtual void implSideRenderingStats(CCRenderingStats&) = 0;
-
virtual const LayerRendererCapabilities& layerRendererCapabilities() const = 0;
virtual void setNeedsAnimate() = 0;
Deleted: trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderingStats.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderingStats.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderingStats.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CCRenderingStats_h
-#define CCRenderingStats_h
-
-namespace WebCore {
-
-struct CCRenderingStats {
- int numAnimationFrames;
- int numFramesSentToScreen;
-
- CCRenderingStats()
- : numAnimationFrames(0)
- , numFramesSentToScreen(0)
- {
- }
-};
-
-}
-
-#endif
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -31,7 +31,6 @@
#include "cc/CCFontAtlas.h"
#include "cc/CCGraphicsContext.h"
#include "cc/CCLayerTreeHost.h"
-#include "cc/CCRenderingStats.h"
#include "cc/CCTextureUpdater.h"
#include "cc/CCTimer.h"
#include <wtf/CurrentTime.h>
@@ -199,11 +198,6 @@
return initialized;
}
-void CCSingleThreadProxy::implSideRenderingStats(CCRenderingStats& stats)
-{
- stats.numFramesSentToScreen = m_layerTreeHostImpl->sourceAnimationFrameNumber();
-}
-
const LayerRendererCapabilities& CCSingleThreadProxy::layerRendererCapabilities() const
{
ASSERT(m_layerRendererInitialized);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -52,7 +52,6 @@
virtual bool initializeLayerRenderer() OVERRIDE;
virtual bool recreateContext() OVERRIDE;
virtual int compositorIdentifier() const OVERRIDE { return m_compositorIdentifier; }
- virtual void implSideRenderingStats(CCRenderingStats&) OVERRIDE;
virtual const LayerRendererCapabilities& layerRendererCapabilities() const OVERRIDE;
virtual void loseContext() OVERRIDE;
virtual void setNeedsAnimate() OVERRIDE;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -36,7 +36,6 @@
#include "cc/CCGraphicsContext.h"
#include "cc/CCInputHandler.h"
#include "cc/CCLayerTreeHost.h"
-#include "cc/CCRenderingStats.h"
#include "cc/CCScheduler.h"
#include "cc/CCScopedThreadProxy.h"
#include "cc/CCTextureUpdater.h"
@@ -268,17 +267,6 @@
return m_compositorIdentifier;
}
-void CCThreadProxy::implSideRenderingStats(CCRenderingStats& stats)
-{
- ASSERT(isMainThread());
-
- CCCompletionEvent completion;
- CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::implSideRenderingStatsOnImplThread,
- AllowCrossThreadAccess(&completion),
- AllowCrossThreadAccess(&stats)));
- completion.wait();
-}
-
const LayerRendererCapabilities& CCThreadProxy::layerRendererCapabilities() const
{
ASSERT(m_layerRendererInitialized);
@@ -892,11 +880,4 @@
completion->signal();
}
-void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* completion, CCRenderingStats* stats)
-{
- ASSERT(isImplThread());
- stats->numFramesSentToScreen = m_layerTreeHostImpl->sourceAnimationFrameNumber();
- completion->signal();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h (121068 => 121069)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -59,7 +59,6 @@
virtual bool initializeLayerRenderer() OVERRIDE;
virtual bool recreateContext() OVERRIDE;
virtual int compositorIdentifier() const OVERRIDE;
- virtual void implSideRenderingStats(CCRenderingStats&) OVERRIDE;
virtual const LayerRendererCapabilities& layerRendererCapabilities() const OVERRIDE;
virtual void loseContext() OVERRIDE;
virtual void setNeedsAnimate() OVERRIDE;
@@ -141,7 +140,6 @@
void setFullRootLayerDamageOnImplThread();
void acquireLayerTexturesForMainThreadOnImplThread(CCCompletionEvent*);
void recreateContextOnImplThread(CCCompletionEvent*, CCGraphicsContext*, bool* recreateSucceeded, LayerRendererCapabilities*);
- void implSideRenderingStatsOnImplThread(CCCompletionEvent*, CCRenderingStats*);
CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw);
void setFontAtlasOnImplThread(PassOwnPtr<CCFontAtlas>);
void forceSerializeOnSwapBuffersOnImplThread(CCCompletionEvent*);
Modified: trunk/Source/WebKit/chromium/ChangeLog (121068 => 121069)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-22 23:16:51 UTC (rev 121069)
@@ -1,3 +1,24 @@
+2012-06-22 Kenneth Russell <[email protected]>
+
+ Unreviewed, rolling out r121064.
+ http://trac.webkit.org/changeset/121064
+ https://bugs.webkit.org/show_bug.cgi?id=88268
+
+ Broke Chromium Mac build.
+
+ * public/WebView.h:
+ (WebKit):
+ (WebView):
+ * src/WebLayerTreeView.cpp:
+ * src/WebViewImpl.cpp:
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF::CCLayerTreeHostTestScrollSimple::layout):
+ (WTF::CCLayerTreeHostTestScrollMultipleRedraw::drawLayersOnCCThread):
+ (WTF::CCLayerTreeHostTestVisibilityAndAllocationControlDrawing::didCommitAndDrawFrame):
+ (WTF::CCLayerTreeHostTestVisibilityAndAllocationControlDrawing::didCommit):
+
2012-06-22 Dave Tu <[email protected]>
[chromium] Expose rendering statistics to WebWidget.
Modified: trunk/Source/WebKit/chromium/public/WebView.h (121068 => 121069)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -62,7 +62,6 @@
struct WebMediaPlayerAction;
struct WebPluginAction;
struct WebPoint;
-struct WebRenderingStats;
class WebView : public WebWidget {
public:
@@ -460,10 +459,6 @@
virtual bool setEditableSelectionOffsets(int start, int end) = 0;
- // Fills in a WebRenderingStats struct containing information about the state of the compositor.
- // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
- virtual void renderingStats(WebRenderingStats&) const { }
-
// Visibility -----------------------------------------------------------
// Sets the visibility of the WebView.
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (121068 => 121069)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -31,12 +31,10 @@
#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 <public/WebRenderingStats.h>
using namespace WebCore;
@@ -180,15 +178,6 @@
return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_private->layerTreeHost()->context()->context3D());
}
-void WebLayerTreeView::renderingStats(WebRenderingStats& stats) const
-{
- CCRenderingStats ccStats;
- m_private->layerTreeHost()->renderingStats(ccStats);
-
- stats.numAnimationFrames = ccStats.numAnimationFrames;
- stats.numFramesSentToScreen = ccStats.numFramesSentToScreen;
-}
-
void WebLayerTreeView::loseCompositorContext(int numTimes)
{
m_private->layerTreeHost()->loseContext(numTimes);
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (121068 => 121069)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -728,13 +728,6 @@
scheduleAnimation();
}
-void WebViewImpl::renderingStats(WebRenderingStats& stats) const
-{
- ASSERT(isAcceleratedCompositingActive());
- if (!m_layerTreeView.isNull())
- m_layerTreeView.renderingStats(stats);
-}
-
void WebViewImpl::startPageScaleAnimation(const IntPoint& scroll, bool useAnchor, float newScale, double durationSec)
{
if (!m_layerTreeView.isNull())
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (121068 => 121069)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-06-22 23:16:51 UTC (rev 121069)
@@ -293,7 +293,6 @@
virtual void updateBatteryStatus(const WebBatteryStatus&);
#endif
virtual void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&);
- virtual void renderingStats(WebRenderingStats&) const;
// WebLayerTreeViewClient
virtual void willBeginFrame();
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (121068 => 121069)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-06-22 23:13:42 UTC (rev 121068)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-06-22 23:16:51 UTC (rev 121069)
@@ -832,7 +832,7 @@
virtual void layout()
{
LayerChromium* root = m_layerTreeHost->rootLayer();
- if (!m_layerTreeHost->commitNumber())
+ if (!m_layerTreeHost->frameNumber())
EXPECT_EQ(root->scrollPosition(), m_initialScroll);
else {
EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount);
@@ -918,7 +918,7 @@
root->setScrollable(true);
root->setMaxScrollPosition(IntSize(100, 100));
- if (!impl->sourceFrameNumber() && impl->sourceAnimationFrameNumber() == 1) {
+ if (!impl->sourceFrameNumber() && impl->frameNumber() == 1) {
// First draw after first commit.
EXPECT_EQ(root->scrollDelta(), IntSize());
root->scrollBy(m_scrollAmount);
@@ -926,7 +926,7 @@
EXPECT_EQ(root->scrollPosition(), m_initialScroll);
postSetNeedsRedrawToMainThread();
- } else if (!impl->sourceFrameNumber() && impl->sourceAnimationFrameNumber() == 2) {
+ } else if (!impl->sourceFrameNumber() && impl->frameNumber() == 2) {
// Second draw after first commit.
EXPECT_EQ(root->scrollDelta(), m_scrollAmount);
root->scrollBy(m_scrollAmount);
@@ -936,7 +936,7 @@
postSetNeedsCommitToMainThread();
} else if (impl->sourceFrameNumber() == 1) {
// Third or later draw after second commit.
- EXPECT_GE(impl->sourceAnimationFrameNumber(), 3);
+ EXPECT_GE(impl->frameNumber(), 3);
EXPECT_EQ(root->scrollDelta(), IntSize());
EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount + m_scrollAmount);
endTest();
@@ -1009,7 +1009,7 @@
virtual void didCommitAndDrawFrame()
{
- int lastFrame = m_layerTreeHost->commitNumber() - 1;
+ int lastFrame = m_layerTreeHost->frameNumber() - 1;
// These frames should draw.
switch (lastFrame) {
@@ -1040,7 +1040,7 @@
virtual void didCommit()
{
- int lastFrame = m_layerTreeHost->commitNumber() - 1;
+ int lastFrame = m_layerTreeHost->frameNumber() - 1;
// These frames should not draw.
switch (lastFrame) {
@@ -2308,7 +2308,7 @@
virtual void beginCommitOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
{
EXPECT_EQ(m_rootScrollLayer->scrollPosition(), IntPoint());
- if (!m_layerTreeHost->commitNumber())
+ if (!m_layerTreeHost->frameNumber())
EXPECT_EQ(m_childLayer->scrollPosition(), IntPoint());
else
EXPECT_EQ(m_childLayer->scrollPosition(), IntPoint() + m_scrollAmount);
@@ -2316,11 +2316,11 @@
virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
{
- if (impl->sourceAnimationFrameNumber() == 1) {
+ if (impl->frameNumber() == 1) {
EXPECT_EQ(impl->scrollBegin(IntPoint(5, 5), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollStarted);
impl->scrollBy(m_scrollAmount);
impl->scrollEnd();
- } else if (impl->sourceAnimationFrameNumber() == 2)
+ } else if (impl->frameNumber() == 2)
endTest();
}
