Diff
Modified: trunk/Source/WebCore/ChangeLog (111440 => 111441)
--- trunk/Source/WebCore/ChangeLog 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/ChangeLog 2012-03-20 21:34:10 UTC (rev 111441)
@@ -1,3 +1,33 @@
+2012-03-20 Dana Jansens <[email protected]>
+
+ [chromium] Allow us to disable overdraw metrics when tracing is off
+ https://bugs.webkit.org/show_bug.cgi?id=81431
+
+ Reviewed by Adrienne Walker.
+
+ This change allows us to disable overdraw metrics conditionally in the
+ future with a one-line change in each LayerTreeHost class.
+
+ Unit test: CCQuadCullerTest.verifyWithoutMetrics
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::paintLayerContents):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::calculateRenderPasses):
+ * platform/graphics/chromium/cc/CCOcclusionTracker.cpp:
+ (WebCore::::CCOcclusionTrackerBase):
+ (WebCore):
+ * platform/graphics/chromium/cc/CCOcclusionTracker.h:
+ (CCOcclusionTrackerBase):
+ * platform/graphics/chromium/cc/CCOverdrawMetrics.cpp:
+ (WebCore::CCOverdrawMetrics::CCOverdrawMetrics):
+ (WebCore::CCOverdrawMetrics::didCull):
+ (WebCore::CCOverdrawMetrics::didDraw):
+ (WebCore::CCOverdrawMetrics::recordMetrics):
+ * platform/graphics/chromium/cc/CCOverdrawMetrics.h:
+ (WebCore::CCOverdrawMetrics::create):
+ (CCOverdrawMetrics):
+
2012-03-20 Robert Hogan <[email protected]>
Use-after-free of continuation in RenderBlock::paintContinuationOutlines()
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -547,7 +547,8 @@
// Use FrontToBack to allow for testing occlusion and performing culling during the tree walk.
typedef CCLayerIterator<LayerChromium, Vector<RefPtr<LayerChromium> >, RenderSurfaceChromium, CCLayerIteratorActions::FrontToBack> CCLayerIteratorType;
- CCOcclusionTracker occlusionTracker(IntRect(IntPoint(), viewportSize()));
+ bool recordMetricsForFrame = true; // FIXME: In the future, disable this when about:tracing is off.
+ CCOcclusionTracker occlusionTracker(IntRect(IntPoint(), viewportSize()), recordMetricsForFrame);
occlusionTracker.setUsePaintTracking(true); // FIXME: Remove this after m19 branch.
CCLayerIteratorType end = CCLayerIteratorType::end(&renderSurfaceLayerList);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -280,8 +280,10 @@
scissorRect = enclosingIntRect(m_rootDamageRect);
else
scissorRect = IntRect(IntPoint(), viewportSize());
- CCOcclusionTrackerImpl occlusionTracker(scissorRect);
+ bool recordMetricsForFrame = true; // FIXME: In the future, disable this when about:tracing is off.
+ CCOcclusionTrackerImpl occlusionTracker(scissorRect, recordMetricsForFrame);
+
// Add quads to the Render passes in FrontToBack order to allow for testing occlusion and performing culling during the tree walk.
typedef CCLayerIterator<CCLayerImpl, Vector<CCLayerImpl*>, CCRenderSurface, CCLayerIteratorActions::FrontToBack> CCLayerIteratorType;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.cpp (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -39,9 +39,9 @@
namespace WebCore {
template<typename LayerType, typename RenderSurfaceType>
-CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace)
+CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace, bool recordMetricsForFrame)
: m_scissorRectInScreenSpace(scissorRectInScreenSpace)
- , m_overdrawMetrics(CCOverdrawMetrics::create())
+ , m_overdrawMetrics(CCOverdrawMetrics::create(recordMetricsForFrame))
, m_usePaintTracking(true) // FIXME: Remove this when paint tracking is on for paint culling.
{
}
@@ -369,7 +369,7 @@
// Declare the possible functions here for the linker.
-template CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace);
+template CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace, bool recordMetricsForFrame);
template void CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::enterTargetRenderSurface(const RenderSurfaceChromium* newTarget);
template void CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::finishedTargetRenderSurface(const LayerChromium* owningLayer, const RenderSurfaceChromium* finishedTarget);
template void CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::leaveToTargetRenderSurface(const RenderSurfaceChromium* newTarget);
@@ -380,7 +380,7 @@
template const Region& CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::currentOcclusionInTargetSurface() const;
template IntRect CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::layerScissorRectInTargetSurface(const LayerChromium*) const;
-template CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace);
+template CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace, bool recordMetricsForFrame);
template void CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::enterTargetRenderSurface(const CCRenderSurface* newTarget);
template void CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::finishedTargetRenderSurface(const CCLayerImpl* owningLayer, const CCRenderSurface* finishedTarget);
template void CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::leaveToTargetRenderSurface(const CCRenderSurface* newTarget);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.h (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.h 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.h 2012-03-20 21:34:10 UTC (rev 111441)
@@ -46,7 +46,7 @@
class CCOcclusionTrackerBase {
WTF_MAKE_NONCOPYABLE(CCOcclusionTrackerBase);
public:
- CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace);
+ CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace, bool recordMetricsForFrame);
// Called when visiting a layer representing itself. If the target was not already current, then this indicates we have entered a new surface subtree.
void enterTargetRenderSurface(const RenderSurfaceType* newTarget);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -37,8 +37,9 @@
namespace WebCore {
-CCOverdrawMetrics::CCOverdrawMetrics()
- : m_pixelsDrawnOpaque(0)
+CCOverdrawMetrics::CCOverdrawMetrics(bool recordMetricsForFrame)
+ : m_recordMetricsForFrame(recordMetricsForFrame)
+ , m_pixelsDrawnOpaque(0)
, m_pixelsDrawnTranslucent(0)
, m_pixelsCulled(0)
{
@@ -60,6 +61,9 @@
void CCOverdrawMetrics::didCull(const TransformationMatrix& transformToTarget, const IntRect& beforeCullRect, const IntRect& afterCullRect)
{
+ if (!m_recordMetricsForFrame)
+ return;
+
float beforeCullArea = quadArea(transformToTarget.mapQuad(FloatQuad(beforeCullRect)));
float afterCullArea = quadArea(transformToTarget.mapQuad(FloatQuad(afterCullRect)));
@@ -68,6 +72,9 @@
void CCOverdrawMetrics::didDraw(const TransformationMatrix& transformToTarget, const IntRect& afterCullRect, const IntRect& opaqueRect)
{
+ if (!m_recordMetricsForFrame)
+ return;
+
float afterCullArea = quadArea(transformToTarget.mapQuad(FloatQuad(afterCullRect)));
float afterCullOpaqueArea = quadArea(transformToTarget.mapQuad(FloatQuad(intersection(opaqueRect, afterCullRect))));
@@ -77,12 +84,14 @@
void CCOverdrawMetrics::recordMetrics(const CCLayerTreeHost* layerTreeHost) const
{
- recordMetricsInternal<CCLayerTreeHost>(UPLOADING, layerTreeHost);
+ if (m_recordMetricsForFrame)
+ recordMetricsInternal<CCLayerTreeHost>(UPLOADING, layerTreeHost);
}
void CCOverdrawMetrics::recordMetrics(const CCLayerTreeHostImpl* layerTreeHost) const
{
- recordMetricsInternal<CCLayerTreeHostImpl>(DRAWING, layerTreeHost);
+ if (m_recordMetricsForFrame)
+ recordMetricsInternal<CCLayerTreeHostImpl>(DRAWING, layerTreeHost);
}
template<typename LayerTreeHostType>
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.h (111440 => 111441)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.h 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.h 2012-03-20 21:34:10 UTC (rev 111441)
@@ -36,7 +36,7 @@
// FIXME: compute overdraw metrics only occasionally, not every frame.
class CCOverdrawMetrics {
public:
- static PassOwnPtr<CCOverdrawMetrics> create() { return adoptPtr(new CCOverdrawMetrics()); }
+ static PassOwnPtr<CCOverdrawMetrics> create(bool recordMetricsForFrame) { return adoptPtr(new CCOverdrawMetrics(recordMetricsForFrame)); }
void didCull(const TransformationMatrix& transformToTarget, const IntRect& beforeCullRect, const IntRect& afterCullRect);
void didDraw(const TransformationMatrix& transformToTarget, const IntRect& afterCullRect, const IntRect& opaqueRect);
@@ -50,7 +50,7 @@
float pixelsCulled() const { return m_pixelsCulled; }
private:
- CCOverdrawMetrics();
+ explicit CCOverdrawMetrics(bool recordMetricsForFrame);
enum MetricsType {
DRAWING,
@@ -60,6 +60,8 @@
template<typename LayerTreeHostType>
void recordMetricsInternal(MetricsType, const LayerTreeHostType*) const;
+ // When false this class is a giant no-op.
+ bool m_recordMetricsForFrame;
// Count of pixels that are opaque (and thus occlude). Ideally this is no more
// than wiewport width x height.
float m_pixelsDrawnOpaque;
Modified: trunk/Source/WebKit/chromium/ChangeLog (111440 => 111441)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-20 21:34:10 UTC (rev 111441)
@@ -1,5 +1,21 @@
2012-03-20 Dana Jansens <[email protected]>
+ [chromium] Allow us to disable overdraw metrics when tracing is off
+ https://bugs.webkit.org/show_bug.cgi?id=81431
+
+ Reviewed by Adrienne Walker.
+
+ * tests/CCOcclusionTrackerTest.cpp:
+ (WebCore::TestCCOcclusionTrackerBase::TestCCOcclusionTrackerBase):
+ * tests/CCQuadCullerTest.cpp:
+ (WebCore::TestCCOcclusionTrackerImpl::TestCCOcclusionTrackerImpl):
+ (WebCore::TEST):
+ (WebCore):
+ * tests/TiledLayerChromiumTest.cpp:
+ (WTF::TestCCOcclusionTracker::TestCCOcclusionTracker):
+
+2012-03-20 Dana Jansens <[email protected]>
+
[chromium] Use opaque contents for paint culling
https://bugs.webkit.org/show_bug.cgi?id=81676
Modified: trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (111440 => 111441)
--- trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -75,8 +75,8 @@
template<typename LayerType, typename RenderSurfaceType>
class TestCCOcclusionTrackerBase : public CCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
public:
- TestCCOcclusionTrackerBase(IntRect screenScissorRect)
- : CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect)
+ TestCCOcclusionTrackerBase(IntRect screenScissorRect, bool recordMetricsForFrame = false)
+ : CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
, m_overrideLayerScissorRect(false)
{
}
Modified: trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp (111440 => 111441)
--- trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -40,8 +40,8 @@
class TestCCOcclusionTrackerImpl : public CCOcclusionTrackerImpl {
public:
- TestCCOcclusionTrackerImpl(const IntRect& scissorRectInScreen)
- : CCOcclusionTrackerImpl(scissorRectInScreen)
+ TestCCOcclusionTrackerImpl(const IntRect& scissorRectInScreen, bool recordMetricsForFrame = true)
+ : CCOcclusionTrackerImpl(scissorRectInScreen, recordMetricsForFrame)
, m_scissorRectInScreen(scissorRectInScreen)
{
// Pretend we have visited a render surface.
@@ -447,4 +447,22 @@
EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsCulled(), 130000, 1);
}
+TEST(CCQuadCullerTest, verifyWithoutMetrics)
+{
+ DECLARE_AND_INITIALIZE_TEST_QUADS
+
+ OwnPtr<CCTiledLayerImpl> rootLayer = makeLayer(TransformationMatrix(), rootRect, 1.0, true, IntRect());
+ OwnPtr<CCTiledLayerImpl> childLayer = makeLayer(TransformationMatrix(), childRect, 1.0, true, IntRect());
+ TestCCOcclusionTrackerImpl occlusionTracker(IntRect(50, 50, 200, 200), false);
+
+ appendQuads(quadList, sharedStateList, childLayer.get(), occlusionTracker);
+ occlusionTracker.markOccludedBehindLayer(childLayer.get());
+ appendQuads(quadList, sharedStateList, rootLayer.get(), occlusionTracker);
+ EXPECT_EQ(quadList.size(), 9u);
+ EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnOpaque(), 0, 1);
+ EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnTranslucent(), 0, 1);
+ EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsCulled(), 0, 1);
+}
+
+
} // namespace
Modified: trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp (111440 => 111441)
--- trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp 2012-03-20 21:33:55 UTC (rev 111440)
+++ trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp 2012-03-20 21:34:10 UTC (rev 111441)
@@ -51,7 +51,7 @@
class TestCCOcclusionTracker : public CCOcclusionTracker {
public:
TestCCOcclusionTracker()
- : CCOcclusionTracker(IntRect(0, 0, 1000, 1000))
+ : CCOcclusionTracker(IntRect(0, 0, 1000, 1000), true)
, m_scissorRectInScreen(IntRect(0, 0, 1000, 1000))
{
// Pretend we have visited a render surface.
