Changeset 116481 in webkit

Timestamp:

May 8, 2012 7:26:23 PM (12 years ago)

Author:

danakj@chromium.org

Message:

[chromium] Show borders for partial-draw-culled quads to visualize culling behaviour
​https://bugs.webkit.org/show_bug.cgi?id=85414

Reviewed by Adrienne Walker.

Source/WebCore:

The borders are brown, and are only shown when the quad's visible rect
is non-empty and is different from the quad's original rect.

Adds a flag to CCQuadCuller constructor, to enable showing debug borders
around what it leaves after culling (when it culls anything in a quad
at all).

• platform/graphics/chromium/cc/CCDrawQuad.h:

(WebCore::CCDrawQuad::isDebugQuad):
(WebCore::CCDrawQuad::sharedQuadState):
(CCDrawQuad):

• platform/graphics/chromium/cc/CCQuadCuller.cpp:

(WebCore):
(WebCore::CCQuadCuller::CCQuadCuller):
(WebCore::appendQuadInternal):
(WebCore::CCQuadCuller::append):
(WebCore::CCQuadCuller::appendSurface):
(WebCore::CCQuadCuller::appendReplica):

• platform/graphics/chromium/cc/CCQuadCuller.h:

(CCQuadCuller):

• platform/graphics/chromium/cc/CCRenderPass.cpp:

(WebCore::CCRenderPass::appendQuadsForLayer):
(WebCore::CCRenderPass::appendQuadsForRenderSurfaceLayer):

Source/WebKit/chromium:

• tests/CCQuadCullerTest.cpp:

(WebCore::appendQuads):

• tests/MockCCQuadCuller.h:

(WebCore::MockCCQuadCuller::MockCCQuadCuller):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCDrawQuad.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp (modified) (6 diffs)
• WebCore/platform/graphics/chromium/cc/CCQuadCuller.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/CCQuadCullerTest.cpp (modified) (1 diff)
• WebKit/chromium/tests/MockCCQuadCuller.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Show borders for partial-draw-culled quads to visualize culling behaviour
+        https://bugs.webkit.org/show_bug.cgi?id=85414
+
+        Reviewed by Adrienne Walker.
+
+        The borders are brown, and are only shown when the quad's visible rect
+        is non-empty and is different from the quad's original rect.
+
+        Adds a flag to CCQuadCuller constructor, to enable showing debug borders
+        around what it leaves after culling (when it culls anything in a quad
+        at all).
+
+        * platform/graphics/chromium/cc/CCDrawQuad.h:
+        (WebCore::CCDrawQuad::isDebugQuad):
+        (WebCore::CCDrawQuad::sharedQuadState):
+        (CCDrawQuad):
+        * platform/graphics/chromium/cc/CCQuadCuller.cpp:
+        (WebCore):
+        (WebCore::CCQuadCuller::CCQuadCuller):
+        (WebCore::appendQuadInternal):
+        (WebCore::CCQuadCuller::append):
+        (WebCore::CCQuadCuller::appendSurface):
+        (WebCore::CCQuadCuller::appendReplica):
+        * platform/graphics/chromium/cc/CCQuadCuller.h:
+        (CCQuadCuller):
+        * platform/graphics/chromium/cc/CCRenderPass.cpp:
+        (WebCore::CCRenderPass::appendQuadsForLayer):
+        (WebCore::CCRenderPass::appendQuadsForRenderSurfaceLayer):
+
 2012-05-08  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h

@@ -76 +76 @@
 
     Material material() const { return m_material; }
+    bool isDebugQuad() const { return m_material == DebugBorder; }
 
     const CCCheckerboardDrawQuad* toCheckerboardDrawQuad() const;
@@ -85 +86 @@
     const CCTileDrawQuad* toTileDrawQuad() const;
     const CCVideoDrawQuad* toVideoDrawQuad() const;
+
+    const CCSharedQuadState* sharedQuadState() const { return m_sharedQuadState; }
 
 protected:

trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp

@@ -32 +32 @@
 #include "Region.h"
 #include "TransformationMatrix.h"
+#include "cc/CCDebugBorderDrawQuad.h"
 #include "cc/CCLayerImpl.h"
 #include "cc/CCOverdrawMetrics.h"
@@ -41 +42 @@
 namespace WebCore {
 
-CCQuadCuller::CCQuadCuller(CCQuadList& quadList, CCLayerImpl* layer, const CCOcclusionTrackerImpl* occlusionTracker)
+static const int debugTileBorderWidth = 1;
+static const int debugTileBorderAlpha = 120;
+static const int debugTileBorderColorRed = 160;
+static const int debugTileBorderColorGreen = 100;
+static const int debugTileBorderColorBlue = 0;
+
+CCQuadCuller::CCQuadCuller(CCQuadList& quadList, CCLayerImpl* layer, const CCOcclusionTrackerImpl* occlusionTracker, bool showCullingWithDebugBorderQuads)
     : m_quadList(quadList)
     , m_layer(layer)
     , m_occlusionTracker(occlusionTracker)
+    , m_showCullingWithDebugBorderQuads(showCullingWithDebugBorderQuads)
 {
 }
 
-static inline bool appendQuadInternal(PassOwnPtr<CCDrawQuad> passDrawQuad, const IntRect& culledRect, CCQuadList& quadList, const CCOcclusionTrackerImpl& occlusionTracker)
+static inline bool appendQuadInternal(PassOwnPtr<CCDrawQuad> passDrawQuad, const IntRect& culledRect, CCQuadList& quadList, const CCOcclusionTrackerImpl& occlusionTracker, bool createDebugBorderQuads)
 {
     OwnPtr<CCDrawQuad> drawQuad(passDrawQuad);
@@ -58 +66 @@
     occlusionTracker.overdrawMetrics().didDraw(drawQuad->quadTransform(), culledRect, drawQuad->opaqueRect());
 
-    // Release the quad after we're done using it.
-    if (keepQuad)
+    if (keepQuad) {
+        if (createDebugBorderQuads && !drawQuad->isDebugQuad() && drawQuad->quadVisibleRect() != drawQuad->quadRect()) {
+            Color borderColor = Color(debugTileBorderColorRed, debugTileBorderColorGreen, debugTileBorderColorBlue, debugTileBorderAlpha);
+            quadList.append(CCDebugBorderDrawQuad::create(drawQuad->sharedQuadState(), drawQuad->quadVisibleRect(), borderColor, debugTileBorderWidth));
+        }
+
+        // Release the quad after we're done using it.
         quadList.append(drawQuad.release());
+    }
     return keepQuad;
 }
@@ -67 +81 @@
 {
     IntRect culledRect = m_occlusionTracker->unoccludedContentRect(m_layer, passDrawQuad->quadRect());
-    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker);
+    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
 }
 
@@ -73 +87 @@
 {
     IntRect culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRect(m_layer->renderSurface(), false, passDrawQuad->quadRect());
-    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker);
+    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
 }
 
@@ -79 +93 @@
 {
     IntRect culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRect(m_layer->renderSurface(), true, passDrawQuad->quadRect());
-    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker);
+    return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.h

@@ -37 +37 @@
     // Passing 0 for CCOverdrawCounts* is valid, and disable the extra computation
     // done to estimate over draw statistics.
-    CCQuadCuller(CCQuadList&, CCLayerImpl*, const CCOcclusionTrackerImpl*);
+    CCQuadCuller(CCQuadList&, CCLayerImpl*, const CCOcclusionTrackerImpl*, bool showCullingWithDebugBorderQuads);
 
     // Returns true if the quad is added to the list, and false if the quad is entirely culled.
@@ -48 +48 @@
     CCLayerImpl* m_layer;
     const CCOcclusionTrackerImpl* m_occlusionTracker;
+    bool m_showCullingWithDebugBorderQuads;
 };
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp

@@ -61 +61 @@
 void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, bool& hadMissingTiles)
 {
-    CCQuadCuller quadCuller(m_quadList, layer, occlusionTracker);
+    CCQuadCuller quadCuller(m_quadList, layer, occlusionTracker, layer->hasDebugBorders());
 
     OwnPtr<CCSharedQuadState> sharedQuadState = layer->createSharedQuadState();
@@ -73 +73 @@
     // FIXME: render surface layers should be a CCLayerImpl-derived class and
     // not be handled specially here.
-    CCQuadCuller quadCuller(m_quadList, layer, occlusionTracker);
+    CCQuadCuller quadCuller(m_quadList, layer, occlusionTracker, layer->hasDebugBorders());
 
     CCRenderSurface* surface = layer->renderSurface();

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-08  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Show borders for partial-draw-culled quads to visualize culling behaviour
+        https://bugs.webkit.org/show_bug.cgi?id=85414
+
+        Reviewed by Adrienne Walker.
+
+        * tests/CCQuadCullerTest.cpp:
+        (WebCore::appendQuads):
+        * tests/MockCCQuadCuller.h:
+        (WebCore::MockCCQuadCuller::MockCCQuadCuller):
+
 2012-05-08  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp

@@ -92 +92 @@
 {
     occlusionTracker.enterLayer(it);
-    CCQuadCuller quadCuller(quadList, layer, &occlusionTracker);
+    CCQuadCuller quadCuller(quadList, layer, &occlusionTracker, false);
     OwnPtr<CCSharedQuadState> sharedQuadState = layer->createSharedQuadState();
     bool hadMissingTiles = false;

trunk/Source/WebKit/chromium/tests/MockCCQuadCuller.h

@@ -36 +36 @@
 public:
     MockCCQuadCuller()
-        : CCQuadCuller(m_quadListStorage, 0, 0)
+        : CCQuadCuller(m_quadListStorage, 0, 0, false)
         , m_activeQuadList(m_quadListStorage)
     { }
 
     explicit MockCCQuadCuller(CCQuadList& externalQuadList)
-        : CCQuadCuller(externalQuadList, 0, 0)
+        : CCQuadCuller(externalQuadList, 0, 0, false)
         , m_activeQuadList(externalQuadList)
     { }