cc: Move UnoccludedContentRect to Occlusion.

cc/layers/nine_patch_layer_impl.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/layers/nine_patch_layer_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 195 matching lines @@
                        uv_top_left.bottom(),
                        uv_top.width(),
                        uv_left.height());
 
   // Nothing is opaque here.
   // TODO(danakj): Should we look at the SkBitmaps to determine opaqueness?
   gfx::Rect opaque_rect;
   gfx::Rect visible_rect;
   const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
 
-  visible_rect =
-      occlusion_tracker.UnoccludedContentRect(layer_top_left, draw_transform());
+  Occlusion occlusion =
+      occlusion_tracker.GetCurrentOcclusionForLayer(draw_transform());
+
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_top_left);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_left.origin(),
                  uv_top_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_top_right,
-                                                         draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_top_right);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top_right.origin(),
                  uv_top_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_bottom_left,
-                                                         draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_bottom_left);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_left.origin(),
                  uv_bottom_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_bottom_right,
-                                                         draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_bottom_right);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom_right,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom_right.origin(),
                  uv_bottom_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect =
-      occlusion_tracker.UnoccludedContentRect(layer_top, draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_top);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_top,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_top.origin(),
                  uv_top.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect =
-      occlusion_tracker.UnoccludedContentRect(layer_left, draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_left);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_left,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_left.origin(),
                  uv_left.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect =
-      occlusion_tracker.UnoccludedContentRect(layer_right, draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_right);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_right,
                  opaque_rect,
                  layer_right,
                  resource,
                  premultiplied_alpha,
                  uv_right.origin(),
                  uv_right.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
-  visible_rect =
-      occlusion_tracker.UnoccludedContentRect(layer_bottom, draw_transform());
+  visible_rect = occlusion.GetUnoccludedContentRect(layer_bottom);
   if (!visible_rect.IsEmpty()) {
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
     quad->SetNew(shared_quad_state,
                  layer_bottom,
                  opaque_rect,
                  visible_rect,
                  resource,
                  premultiplied_alpha,
                  uv_bottom.origin(),
                  uv_bottom.bottom_right(),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  flipped);
   }
 
   if (fill_center_) {
-    visible_rect =
-        occlusion_tracker.UnoccludedContentRect(layer_center, draw_transform());
+    visible_rect = occlusion.GetUnoccludedContentRect(layer_center);
     if (!visible_rect.IsEmpty()) {
       TextureDrawQuad* quad =
           render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
       quad->SetNew(shared_quad_state,
                    layer_center,
                    opaque_rect,
                    visible_rect,
                    resource,
                    premultiplied_alpha,
                    uv_center.origin(),
@@ skipping 25 matching lines @@
   result->Set("ImageBounds", list);
 
   result->Set("Border", MathUtil::AsValue(border_).release());
 
   result->SetBoolean("FillCenter", fill_center_);
 
   return result;
 }
 
 }  // namespace cc