Update from https://crrev.com/316786

cc/trees/occlusion_tracker.h

 // Copyright 2012 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_TREES_OCCLUSION_TRACKER_H_
 #define CC_TREES_OCCLUSION_TRACKER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
 template <typename LayerType>
 class CC_EXPORT OcclusionTracker {
  public:
   explicit OcclusionTracker(const gfx::Rect& screen_space_clip_rect);
   ~OcclusionTracker();
 
   // Return an occlusion that retains the current state of the tracker
   // and can be used outside of a layer walk to check occlusion.
   Occlusion GetCurrentOcclusionForLayer(
       const gfx::Transform& draw_transform) const;
+  Occlusion GetCurrentOcclusionForContributingSurface(
+      const gfx::Transform& draw_transform) const;
 
   // Called at the beginning of each step in the LayerIterator's front-to-back
   // traversal.
   void EnterLayer(const LayerIteratorPosition<LayerType>& layer_iterator);
   // Called at the end of each step in the LayerIterator's front-to-back
   // traversal.
   void LeaveLayer(const LayerIteratorPosition<LayerType>& layer_iterator);
 
-  // Gives an unoccluded sub-rect of |content_rect| in the content space of the
-  // render_target owned by the layer. Used when considering occlusion for a
-  // contributing surface that is rendering into another target.
-  gfx::Rect UnoccludedContributingSurfaceContentRect(
-      const gfx::Rect& content_rect,
-      const gfx::Transform& draw_transform) const;
-
   // Gives the region of the screen that is not occluded by something opaque.
   Region ComputeVisibleRegionInScreen() const;
 
   void set_minimum_tracking_size(const gfx::Size& size) {
     minimum_tracking_size_ = size;
   }
 
-  // The following is used for visualization purposes.
-  void set_occluding_screen_space_rects_container(
-      std::vector<gfx::Rect>* rects) {
-    occluding_screen_space_rects_ = rects;
-  }
-  void set_non_occluding_screen_space_rects_container(
-      std::vector<gfx::Rect>* rects) {
-    non_occluding_screen_space_rects_ = rects;
-  }
-
  protected:
   struct StackObject {
     StackObject() : target(0) {}
     explicit StackObject(const LayerType* target) : target(target) {}
     const LayerType* target;
     SimpleEnclosedRegion occlusion_from_outside_target;
     SimpleEnclosedRegion occlusion_from_inside_target;
   };
 
   // The stack holds occluded regions for subtrees in the
@@ skipping 28 matching lines @@
   // one. We then perform any operations required for merging results from the
   // child subtree into its parent.
   void LeaveToRenderTarget(const LayerType* new_target);
 
   // Add the layer's occlusion to the tracked state.
   void MarkOccludedBehindLayer(const LayerType* layer);
 
   gfx::Rect screen_space_clip_rect_;
   gfx::Size minimum_tracking_size_;
 
-  // This is used for visualizing the occlusion tracking process.
-  std::vector<gfx::Rect>* occluding_screen_space_rects_;
-  std::vector<gfx::Rect>* non_occluding_screen_space_rects_;
-
   DISALLOW_COPY_AND_ASSIGN(OcclusionTracker);
 };
 
 #if !defined(COMPILER_MSVC)
 extern template class OcclusionTracker<Layer>;
 extern template class OcclusionTracker<LayerImpl>;
 #endif
 
 }  // namespace cc
 
 #endif  // CC_TREES_OCCLUSION_TRACKER_H_