cc: Add debug borders for pictures

Add a different debug state setting for this, as it's often used in
different circumstances than composited layer borders.  Also, turning it
on by default leads to a lot more fruit salad.

R=danakj@chromium.org
BUG=none


Review URL: https://chromiumcodereview.appspot.com/13586007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192305 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 0 deletions

diff --git a/cc/debug/debug_colors.cc b/cc/debug/debug_colors.cc
index 0680261..00b1e07 100644
--- a/cc/debug/debug_colors.cc
+++ b/cc/debug/debug_colors.cc
@@ -237,6 +237,11 @@ SkColor DebugColors::NonPaintedFillColor() { return SK_ColorCYAN; }
 // Missing picture rects in magenta.
 SkColor DebugColors::MissingPictureFillColor() { return SK_ColorMAGENTA; }
 
+// Picture borders in transparent blue.
+SkColor DebugColors::PictureBorderColor() {
+  return SkColorSetARGB(100, 0, 0, 200);
+}
+
 // ======= HUD widget colors =======
 
 SkColor DebugColors::HUDBackgroundColor() {
diff --git a/cc/debug/debug_colors.h b/cc/debug/debug_colors.h
index a5ae859..51be76f 100644
--- a/cc/debug/debug_colors.h
+++ b/cc/debug/debug_colors.h
@@ -94,6 +94,7 @@ class DebugColors {
 
   static SkColor NonPaintedFillColor();
   static SkColor MissingPictureFillColor();
+  static SkColor PictureBorderColor();
 
   static SkColor HUDBackgroundColor();
   static SkColor HUDSeparatorLineColor();
diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc
index 9018be0..34dd1e9 100644
--- a/cc/debug/layer_tree_debug_state.cc
+++ b/cc/debug/layer_tree_debug_state.cc
@@ -22,6 +22,7 @@ LayerTreeDebugState::LayerTreeDebugState()
       show_occluding_rects(false),
       show_non_occluding_rects(false),
       slow_down_raster_scale_factor(0),
+      show_picture_borders(false),
       trace_all_rendered_frames(false),
       record_rendering_stats_(false) {}
 
@@ -66,6 +67,7 @@ bool LayerTreeDebugState::Equal(const LayerTreeDebugState& a,
           a.show_occluding_rects == b.show_occluding_rects &&
           a.show_non_occluding_rects == b.show_non_occluding_rects &&
           a.slow_down_raster_scale_factor == b.slow_down_raster_scale_factor &&
+          a.show_picture_borders == b.show_picture_borders &&
           a.record_rendering_stats_ == b.record_rendering_stats_ &&
           a.trace_all_rendered_frames == b.trace_all_rendered_frames);
 }
@@ -89,6 +91,7 @@ LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
 
   if (b.slow_down_raster_scale_factor)
     r.slow_down_raster_scale_factor = b.slow_down_raster_scale_factor;
+  r.show_picture_borders |= b.show_picture_borders;
 
   r.record_rendering_stats_ |= b.record_rendering_stats_;
   r.trace_all_rendered_frames |= b.trace_all_rendered_frames;
diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h
index c276aadb..5c5b739 100644
--- a/cc/debug/layer_tree_debug_state.h
+++ b/cc/debug/layer_tree_debug_state.h
@@ -29,6 +29,7 @@ class CC_EXPORT LayerTreeDebugState {
   bool show_non_occluding_rects;
 
   int slow_down_raster_scale_factor;
+  bool show_picture_borders;
 
   void SetRecordRenderingStats(bool enabled);
   bool RecordRenderingStats() const;