cc: Add support for debugging layer borders directly in the compositor

cc: Add support for debugging layer borders directly in the compositor

Instead of supporting --show-composited-layer-borders via the GraphicsLayer
debug borders mechanism, show debug borders on layers when the new
LayerTreeSetting flag showDebugBorders is enabled.

This depends on https://bugs.webkit.org/show_bug.cgi?id=102130

BUG=159769
R=jamesr,enne

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167815

[enne (OOO), 2012-11-14 17:22:39]

lgtm

[commit-bot: I haz the power, 2012-11-14 19:17:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11365239/1

[commit-bot: I haz the power, 2012-11-14 20:59:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11365239/1015

[commit-bot: I haz the power, 2012-11-14 21:46:39]

Retried try job too often for step(s) content_unittests

[commit-bot: I haz the power, 2012-11-14 22:10:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11365239/1015

[commit-bot: I haz the power, 2012-11-14 22:10:34]

Failed to apply patch for cc/layer_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layer_impl.cc
  Hunk #1 FAILED at 9.
  1 out of 4 hunks FAILED -- saving rejects to file cc/layer_impl.cc.rej

Patch:       cc/layer_impl.cc
Index: cc/layer_impl.cc
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index
25a5fc5f43342ea90d3aa3aed6c25ffeed5d195d..0b66732c251b33fc5485e0594652597a77d6201c
100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -9,6 +9,7 @@
 #include "cc/debug_border_draw_quad.h"
 #include "cc/geometry.h"
 #include "cc/layer_sorter.h"
+#include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
 #include "cc/proxy.h"
 #include "cc/quad_sink.h"
@@ -54,8 +55,6 @@ LayerImpl::LayerImpl(int id)
     , m_drawDepth(0)
     , m_drawOpacity(0)
     , m_drawOpacityIsAnimating(false)
-    , m_debugBorderColor(0)
-    , m_debugBorderWidth(0)
     , m_filter(0)
     , m_drawTransformIsAnimating(false)
     , m_screenSpaceTransformIsAnimating(false)
@@ -146,13 +145,45 @@ void LayerImpl::didDraw(ResourceProvider*)
 #endif
 }
 
+bool LayerImpl::showDebugBorders() const
+{
+    if (!m_layerTreeHostImpl)
+        return false;
+    return m_layerTreeHostImpl->settings().showDebugBorders;
+}
+
+void LayerImpl::getDebugBorderProperties(SkColor* color, float* width) const
+{
+    if (m_drawsContent) {
+        // Non-tiled content layers are green.
+        *color = SkColorSetARGB(128, 0, 128, 32);
+        *width = 2;
+        return;
+    }
+
+    if (m_masksToBounds) {
+        // Masking layers are pale blue.
+        *color = SkColorSetARGB(48, 128, 255, 255);
+        *width = 20;
+        return;
+    }
+
+    // Other container layers are yellow.
+    *color = SkColorSetARGB(192, 255, 255, 0);
+    *width = 2;
+}
+
 void LayerImpl::appendDebugBorderQuad(QuadSink& quadList, const
SharedQuadState* sharedQuadState, AppendQuadsData& appendQuadsData) const
 {
-    if (!hasDebugBorders())
+    if (!showDebugBorders())
         return;
 
+    SkColor color;
+    float width;
+    getDebugBorderProperties(&color, &width);
+
     gfx::Rect contentRect(gfx::Point(), contentBounds());
-    quadList.append(DebugBorderDrawQuad::create(sharedQuadState, contentRect,
debugBorderColor(), debugBorderWidth()).PassAs<DrawQuad>(), appendQuadsData);
+    quadList.append(DebugBorderDrawQuad::create(sharedQuadState, contentRect,
color, width).PassAs<DrawQuad>(), appendQuadsData);
 }
 
 bool LayerImpl::hasContributingDelegatedRenderPasses() const
@@ -587,29 +618,6 @@ bool LayerImpl::transformIsAnimating() const
     return
m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform);
 }
 
-void LayerImpl::setDebugBorderColor(SkColor debugBorderColor)
-{
-    if (m_debugBorderColor == debugBorderColor)
-        return;
-
-    m_debugBorderColor = debugBorderColor;
-    m_layerPropertyChanged = true;
-}
-
-void LayerImpl::setDebugBorderWidth(float debugBorderWidth)
-{
-    if (m_debugBorderWidth == debugBorderWidth)
-        return;
-
-    m_debugBorderWidth = debugBorderWidth;
-    m_layerPropertyChanged = true;
-}
-
-bool LayerImpl::hasDebugBorders() const
-{
-    return SkColorGetA(m_debugBorderColor) && debugBorderWidth() > 0;
-}
-
 void LayerImpl::setContentBounds(const gfx::Size& contentBounds)
 {
     if (m_contentBounds == contentBounds)

[commit-bot: I haz the power, 2012-11-14 22:29:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/11365239/12017

[commit-bot: I haz the power, 2012-11-15 01:47:46]

Change committed as 167815