Update from https://crrev.com/316786

cc/debug/debug_rect_history.cc

 // 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.
 
 #include "cc/debug/debug_rect_history.h"
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/layer_utils.h"
@@ skipping 11 matching lines @@
 }
 
 DebugRectHistory::DebugRectHistory() {}
 
 DebugRectHistory::~DebugRectHistory() {}
 
 void DebugRectHistory::SaveDebugRectsForCurrentFrame(
     LayerImpl* root_layer,
     LayerImpl* hud_layer,
     const LayerImplList& render_surface_layer_list,
-    const std::vector<gfx::Rect>& occluding_screen_space_rects,
-    const std::vector<gfx::Rect>& non_occluding_screen_space_rects,
     const LayerTreeDebugState& debug_state) {
   // For now, clear all rects from previous frames. In the future we may want to
   // store all debug rects for a history of many frames.
   debug_rects_.clear();
 
   if (debug_state.show_touch_event_handler_rects)
     SaveTouchEventHandlerRects(root_layer);
 
   if (debug_state.show_wheel_event_handler_rects)
     SaveWheelEventHandlerRects(root_layer);
 
   if (debug_state.show_scroll_event_handler_rects)
     SaveScrollEventHandlerRects(root_layer);
 
   if (debug_state.show_non_fast_scrollable_rects)
     SaveNonFastScrollableRects(root_layer);
 
   if (debug_state.show_paint_rects)
     SavePaintRects(root_layer);
 
   if (debug_state.show_property_changed_rects)
     SavePropertyChangedRects(render_surface_layer_list, hud_layer);
 
   if (debug_state.show_surface_damage_rects)
     SaveSurfaceDamageRects(render_surface_layer_list);
 
   if (debug_state.show_screen_space_rects)
     SaveScreenSpaceRects(render_surface_layer_list);
 
-  if (debug_state.show_occluding_rects)
-    SaveOccludingRects(occluding_screen_space_rects);
-
-  if (debug_state.show_non_occluding_rects)
-    SaveNonOccludingRects(non_occluding_screen_space_rects);
-
   if (debug_state.show_layer_animation_bounds_rects)
     SaveLayerAnimationBoundsRects(render_surface_layer_list);
 }
 
 void DebugRectHistory::SavePaintRects(LayerImpl* layer) {
   // We would like to visualize where any layer's paint rect (update rect) has
   // changed, regardless of whether this layer is skipped for actual drawing or
   // not. Therefore we traverse recursively over all layers, not just the render
   // surface list.
 
@@ skipping 84 matching lines @@
     if (render_surface_layer->replica_layer()) {
       debug_rects_.push_back(
           DebugRect(REPLICA_SCREEN_SPACE_RECT_TYPE,
                     MathUtil::MapEnclosingClippedRect(
                         render_surface->replica_screen_space_transform(),
                         render_surface->content_rect())));
     }
   }
 }
 
-void DebugRectHistory::SaveOccludingRects(
-    const std::vector<gfx::Rect>& occluding_rects) {
-  for (size_t i = 0; i < occluding_rects.size(); ++i)
-    debug_rects_.push_back(DebugRect(OCCLUDING_RECT_TYPE, occluding_rects[i]));
-}
-
-void DebugRectHistory::SaveNonOccludingRects(
-    const std::vector<gfx::Rect>& non_occluding_rects) {
-  for (size_t i = 0; i < non_occluding_rects.size(); ++i) {
-    debug_rects_.push_back(
-        DebugRect(NONOCCLUDING_RECT_TYPE, non_occluding_rects[i]));
-  }
-}
-
 void DebugRectHistory::SaveTouchEventHandlerRects(LayerImpl* layer) {
   LayerTreeHostCommon::CallFunctionForSubtree<LayerImpl>(
       layer,
       base::Bind(&DebugRectHistory::SaveTouchEventHandlerRectsCallback,
                  base::Unretained(this)));
 }
 
 void DebugRectHistory::SaveTouchEventHandlerRectsCallback(LayerImpl* layer) {
   for (Region::Iterator iter(layer->touch_event_handler_region());
        iter.has_rect();
@@ skipping 88 matching lines @@
     debug_rects_.push_back(
         DebugRect(ANIMATION_BOUNDS_RECT_TYPE,
                   gfx::ToEnclosingRect(gfx::RectF(inflated_bounds.x(),
                                                   inflated_bounds.y(),
                                                   inflated_bounds.width(),
                                                   inflated_bounds.height()))));
   }
 }
 
 }  // namespace cc