Update from https://crrev.com/316786

cc/layers/render_surface_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
 #define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
+#include "cc/trees/occlusion.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 class DamageTracker;
 class DelegatedRendererLayerImpl;
-template <typename LayerType>
-class OcclusionTracker;
+class Occlusion;
 class RenderPassId;
 class RenderPassSink;
 class LayerImpl;
 template <typename LayerType>
 class LayerIterator;
 
 struct AppendQuadsData;
 
 class CC_EXPORT RenderSurfaceImpl {
  public:
@@ skipping 16 matching lines @@
   }
   const RenderSurfaceImpl* nearest_occlusion_immune_ancestor() const {
     return nearest_occlusion_immune_ancestor_;
   }
 
   void SetDrawOpacityIsAnimating(bool draw_opacity_is_animating) {
     draw_opacity_is_animating_ = draw_opacity_is_animating;
   }
   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;
   }
   const gfx::Transform& draw_transform() const { return draw_transform_; }
 
   void SetScreenSpaceTransform(const gfx::Transform& screen_space_transform) {
     screen_space_transform_ = screen_space_transform;
   }
   const gfx::Transform& screen_space_transform() const {
     return screen_space_transform_;
@@ skipping 40 matching lines @@
   bool contributes_to_drawn_surface() const {
     return contributes_to_drawn_surface_;
   }
   void set_contributes_to_drawn_surface(bool contributes_to_drawn_surface) {
     contributes_to_drawn_surface_ = contributes_to_drawn_surface;
   }
 
   void SetContentRect(const gfx::Rect& content_rect);
   gfx::Rect content_rect() const { return content_rect_; }
 
+  const Occlusion& occlusion_in_content_space() const {
+    return occlusion_in_content_space_;
+  }
+  void set_occlusion_in_content_space(const Occlusion& occlusion) {
+    occlusion_in_content_space_ = occlusion;
+  }
+
   LayerImplList& layer_list() { return layer_list_; }
   void AddContributingDelegatedRenderPassLayer(LayerImpl* layer);
   void ClearLayerLists();
 
   int OwningLayerId() const;
 
   void ResetPropertyChangedFlag() { surface_property_changed_ = false; }
   bool SurfacePropertyChanged() const;
   bool SurfacePropertyChangedOnlyFromDescendant() const;
 
   DamageTracker* damage_tracker() const { return damage_tracker_.get(); }
 
   RenderPassId GetRenderPassId();
 
   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:
   LayerImpl* owning_layer_;
 
   // Uses this surface's space.
   gfx::Rect content_rect_;
   bool surface_property_changed_ : 1;
   bool draw_opacity_is_animating_ : 1;
   bool target_surface_transforms_are_animating_ : 1;
   bool screen_space_transforms_are_animating_ : 1;
 
   bool is_clipped_ : 1;
   bool contributes_to_drawn_surface_ : 1;
 
   float draw_opacity_;
   gfx::Transform draw_transform_;
   gfx::Transform screen_space_transform_;
   gfx::Transform replica_draw_transform_;
   gfx::Transform replica_screen_space_transform_;
 
   // Uses the space of the surface's target surface.
   gfx::Rect clip_rect_;
 
   LayerImplList layer_list_;
   std::vector<DelegatedRendererLayerImpl*>
       contributing_delegated_render_pass_layer_list_;
+  Occlusion occlusion_in_content_space_;
 
   // The nearest ancestor target surface that will contain the contents of this
   // surface, and that ignores outside occlusion. This can point to itself.
   RenderSurfaceImpl* nearest_occlusion_immune_ancestor_;
 
   scoped_ptr<DamageTracker> damage_tracker_;
 
   // For LayerIteratorActions
   int target_render_surface_layer_index_history_;
   int current_layer_index_history_;
 
   friend class LayerIterator<LayerImpl>;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_