cc: Move occlusion debug rects into the debug layer borders.

cc/layers/render_surface_impl.h

Index: cc/layers/render_surface_impl.h
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 3303e94a48bc48ab3fd3d388e3a3783fc368a46f..1cc2de85cd4130c6239cbc1b7d4dd349dd1ad261 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -22,8 +22,7 @@ namespace cc {
 
 class DamageTracker;
 class DelegatedRendererLayerImpl;
-template <typename LayerType>
-class OcclusionTracker;
+class Occlusion;
 class RenderPassId;
 class RenderPassSink;
 class LayerImpl;
@@ -60,6 +59,12 @@ class CC_EXPORT RenderSurfaceImpl {
   }
   bool draw_opacity_is_animating() const { return draw_opacity_is_animating_; }
 
+  SkColor GetDebugBorderColor() const;
+  SkColor GetReplicaDebugBorderColor() const;
+
+  float GetDebugBorderWidth() const;
+  float GetReplicaDebugBorderWidth() const;
+
   void SetDrawTransform(const gfx::Transform& draw_transform) {
     draw_transform_ = draw_transform;
   }
@@ -136,9 +141,12 @@ class CC_EXPORT RenderSurfaceImpl {
 
   void AppendRenderPasses(RenderPassSink* pass_sink);
   void AppendQuads(RenderPass* render_pass,
-                   const OcclusionTracker<LayerImpl>& occlusion_tracker,
+                   const gfx::Transform& draw_transform,
+                   const Occlusion& occlusion_in_content_space,
+                   SkColor debug_border_color,
+                   float debug_border_width,
+                   LayerImpl* mask_layer,
                    AppendQuadsData* append_quads_data,
-                   bool for_replica,
                    RenderPassId render_pass_id);
 
  private: