Removed QuadSink and MockQuadCuller

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/layers/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/trees/layer_tree_impl.h"
+#include "cc/trees/occlusion_tracker.h"
 #include "ui/gfx/rect_f.h"
 
 namespace cc {
 
 NinePatchLayerImpl::NinePatchLayerImpl(LayerTreeImpl* tree_impl, int id)
     : UIResourceLayerImpl(tree_impl, id),
       fill_center_(false) {}
 
 NinePatchLayerImpl::~NinePatchLayerImpl() {}
 
@@ skipping 50 matching lines @@
   DCHECK_GE(border_.x(), 0);
   DCHECK_GE(border_.y(), 0);
 
   // |aperture| is in image space.  It cannot exceed the bounds of the bitmap.
   DCHECK(!image_aperture_.size().IsEmpty());
   DCHECK(gfx::Rect(image_bounds_).Contains(image_aperture_))
       << "image_bounds_ " << gfx::Rect(image_bounds_).ToString()
       << " image_aperture_ " << image_aperture_.ToString();
 }
 
-void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
-                                     AppendQuadsData* append_quads_data) {
+void NinePatchLayerImpl::AppendQuads(
+    RenderPass* render_pass,
+    const OcclusionTracker<LayerImpl>& occlusion_tracker,
+    AppendQuadsData* append_quads_data) {
   CheckGeometryLimitations();
-  SharedQuadState* shared_quad_state = quad_sink->CreateSharedQuadState();
+  SharedQuadState* shared_quad_state =
+      render_pass->CreateAndAppendSharedQuadState();
   PopulateSharedQuadState(shared_quad_state);
 
   AppendDebugBorderQuad(
-      quad_sink, content_bounds(), shared_quad_state, append_quads_data);
+      render_pass, content_bounds(), shared_quad_state, append_quads_data);
 
   if (!ui_resource_id_)
     return;
 
   ResourceProvider::ResourceId resource =
       layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_);
 
   if (!resource)
     return;
 
@@ skipping 104 matching lines @@
                        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};
   scoped_ptr<TextureDrawQuad> quad;
 
   visible_rect =
-      quad_sink->UnoccludedContentRect(layer_top_left, draw_transform());
+      occlusion_tracker.UnoccludedContentRect(layer_top_left, draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
-  visible_rect =
-      quad_sink->UnoccludedContentRect(layer_top_right, draw_transform());
+  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_top_right,
+                                                         draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
-  visible_rect =
-      quad_sink->UnoccludedContentRect(layer_bottom_left, draw_transform());
+  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_bottom_left,
+                                                         draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
-  visible_rect =
-      quad_sink->UnoccludedContentRect(layer_bottom_right, draw_transform());
+  visible_rect = occlusion_tracker.UnoccludedContentRect(layer_bottom_right,
+                                                         draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
-  visible_rect = quad_sink->UnoccludedContentRect(layer_top, draw_transform());
+  visible_rect =
+      occlusion_tracker.UnoccludedContentRect(layer_top, draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
-  visible_rect = quad_sink->UnoccludedContentRect(layer_left, draw_transform());
+  visible_rect =
+      occlusion_tracker.UnoccludedContentRect(layer_left, draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
   visible_rect =
-      quad_sink->UnoccludedContentRect(layer_right, draw_transform());
+      occlusion_tracker.UnoccludedContentRect(layer_right, draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
   visible_rect =
-      quad_sink->UnoccludedContentRect(layer_bottom, draw_transform());
+      occlusion_tracker.UnoccludedContentRect(layer_bottom, draw_transform());
   if (!visible_rect.IsEmpty()) {
     quad = TextureDrawQuad::Create();
     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);
-    quad_sink->Append(quad.PassAs<DrawQuad>());
+    render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
   }
 
   if (fill_center_) {
     visible_rect =
-        quad_sink->UnoccludedContentRect(layer_center, draw_transform());
+        occlusion_tracker.UnoccludedContentRect(layer_center, draw_transform());
     if (!visible_rect.IsEmpty()) {
       quad = TextureDrawQuad::Create();
       quad->SetNew(shared_quad_state,
                    layer_center,
                    opaque_rect,
                    visible_rect,
                    resource,
                    premultiplied_alpha,
                    uv_center.origin(),
                    uv_center.bottom_right(),
                    SK_ColorTRANSPARENT,
                    vertex_opacity,
                    flipped);
-      quad_sink->Append(quad.PassAs<DrawQuad>());
+      render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>());
     }
   }
 }
 
 const char* NinePatchLayerImpl::LayerTypeAsString() const {
   return "cc::NinePatchLayerImpl";
 }
 
 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = LayerImpl::LayerTreeAsJson();
@@ skipping 13 matching lines @@
   result->Set("Border", MathUtil::AsValue(border_).release());
 
   base::FundamentalValue* fill_center =
       base::Value::CreateBooleanValue(fill_center_);
   result->Set("FillCenter", fill_center);
 
   return result;
 }
 
 }  // namespace cc