cc: Move UnoccludedContentRect to Occlusion.

cc/trees/occlusion_tracker_perftest.cc

 // Copyright 2014 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 "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/solid_color_layer_impl.h"
@@ skipping 88 matching lines @@
   LayerIteratorPosition<LayerImpl> pos = begin;
 
   // The opaque_layer adds occlusion over the whole viewport.
   tracker.EnterLayer(pos);
   tracker.LeaveLayer(pos);
 
   gfx::Transform transform_to_target;
   transform_to_target.Translate(0, 96);
 
   do {
+    Occlusion occlusion =
+        tracker.GetCurrentOcclusionForLayer(transform_to_target);
     for (int x = 0; x < viewport_rect.width(); x += 256) {
       for (int y = 0; y < viewport_rect.height(); y += 256) {
         gfx::Rect query_content_rect(x, y, 256, 256);
-        gfx::Rect unoccluded = tracker.UnoccludedContentRect(
-            query_content_rect, transform_to_target);
+        gfx::Rect unoccluded =
+            occlusion.GetUnoccludedContentRect(query_content_rect);
         // Sanity test that we're not hitting early outs.
         bool expect_empty =
             query_content_rect.right() <= viewport_rect.width() &&
             query_content_rect.bottom() + 96 <= viewport_rect.height();
         CHECK_EQ(expect_empty, unoccluded.IsEmpty())
             << query_content_rect.ToString();
       }
     }
 
     timer_.NextLap();
@@ skipping 50 matching lines @@
     ++begin;
   }
   LayerIteratorPosition<LayerImpl> pos = begin;
   tracker.EnterLayer(pos);
   tracker.LeaveLayer(pos);
 
   gfx::Transform transform_to_target;
   transform_to_target.Translate(0, 96);
 
   do {
+    Occlusion occlusion =
+        tracker.GetCurrentOcclusionForLayer(transform_to_target);
     for (int x = 0; x < viewport_rect.width(); x += 256) {
       for (int y = 0; y < viewport_rect.height(); y += 256) {
         gfx::Rect query_content_rect(x, y, 256, 256);
-        gfx::Rect unoccluded = tracker.UnoccludedContentRect(
-            query_content_rect, transform_to_target);
+        gfx::Rect unoccluded =
+            occlusion.GetUnoccludedContentRect(query_content_rect);
       }
     }
 
     timer_.NextLap();
   } while (!timer_.HasTimeLimitExpired());
 
   ++begin;
   LayerIteratorPosition<LayerImpl> next = begin;
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc