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

cc/trees/occlusion_tracker.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/trees/occlusion_tracker.h"
 
 #include <algorithm>
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/render_surface.h"
 #include "cc/layers/render_surface_impl.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 
 template <typename LayerType>
 OcclusionTracker<LayerType>::OcclusionTracker(
     const gfx::Rect& screen_space_clip_rect)
-    : screen_space_clip_rect_(screen_space_clip_rect),
-      occluding_screen_space_rects_(NULL),
-      non_occluding_screen_space_rects_(NULL) {}
+    : screen_space_clip_rect_(screen_space_clip_rect) {
+}
 
 template <typename LayerType>
-OcclusionTracker<LayerType>::~OcclusionTracker() {}
+OcclusionTracker<LayerType>::~OcclusionTracker() {
+}
 
 template <typename LayerType>
 Occlusion OcclusionTracker<LayerType>::GetCurrentOcclusionForLayer(
     const gfx::Transform& draw_transform) const {
   DCHECK(!stack_.empty());
   const StackObject& back = stack_.back();
   return Occlusion(draw_transform,
                    back.occlusion_from_outside_target,
                    back.occlusion_from_inside_target);
 }
@@ skipping 419 matching lines @@
 
   for (size_t i = 0; i < opaque_contents.GetRegionComplexity(); ++i) {
     gfx::Rect transformed_rect =
         MathUtil::MapEnclosedRectWith2dAxisAlignedTransform(
             layer->draw_transform(), opaque_contents.GetRect(i));
     transformed_rect.Intersect(clip_rect_in_target);
     if (transformed_rect.width() < minimum_tracking_size_.width() &&
         transformed_rect.height() < minimum_tracking_size_.height())
       continue;
     stack_.back().occlusion_from_inside_target.Union(transformed_rect);
-
-    if (!occluding_screen_space_rects_)
-      continue;
-
-    // Save the occluding area in screen space for debug visualization.
-    bool clipped;
-    gfx::QuadF screen_space_quad = MathUtil::MapQuad(
-        layer->render_target()->render_surface()->screen_space_transform(),
-        gfx::QuadF(transformed_rect), &clipped);
-    // TODO(danakj): Store the quad in the debug info instead of the bounding
-    // box.
-    gfx::Rect screen_space_rect =
-        gfx::ToEnclosedRect(screen_space_quad.BoundingBox());
-    occluding_screen_space_rects_->push_back(screen_space_rect);
-  }
-
-  if (!non_occluding_screen_space_rects_)
-    return;
-
-  Region non_opaque_contents(gfx::Rect(layer->content_bounds()));
-  non_opaque_contents.Subtract(opaque_contents);
-
-  for (Region::Iterator non_opaque_content_rects(non_opaque_contents);
-       non_opaque_content_rects.has_rect();
-       non_opaque_content_rects.next()) {
-    gfx::Rect transformed_rect =
-        MathUtil::MapEnclosedRectWith2dAxisAlignedTransform(
-            layer->draw_transform(), non_opaque_content_rects.rect());
-    transformed_rect.Intersect(clip_rect_in_target);
-    if (transformed_rect.IsEmpty())
-      continue;
-
-    bool clipped;
-    gfx::QuadF screen_space_quad = MathUtil::MapQuad(
-        layer->render_target()->render_surface()->screen_space_transform(),
-        gfx::QuadF(transformed_rect),
-        &clipped);
-    // TODO(danakj): Store the quad in the debug info instead of the bounding
-    // box.
-    gfx::Rect screen_space_rect =
-        gfx::ToEnclosedRect(screen_space_quad.BoundingBox());
-    non_occluding_screen_space_rects_->push_back(screen_space_rect);
   }
 }
 
 template <typename LayerType>
 Region OcclusionTracker<LayerType>::ComputeVisibleRegionInScreen() const {
   DCHECK(!stack_.back().target->parent());
   const SimpleEnclosedRegion& occluded =
       stack_.back().occlusion_from_inside_target;
   Region visible_region(screen_space_clip_rect_);
   for (size_t i = 0; i < occluded.GetRegionComplexity(); ++i)
     visible_region.Subtract(occluded.GetRect(i));
   return visible_region;
 }
 
 // Instantiate (and export) templates here for the linker.
 template class OcclusionTracker<Layer>;
 template class OcclusionTracker<LayerImpl>;
 
 }  // namespace cc