Revert of cc: nine patch: add occlusion support

cc/layers/nine_patch_layer_impl_unittest.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 <stddef.h>
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/nine_patch_layer_impl.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/ui_resource_bitmap.h"
@@ skipping 17 matching lines @@
   return gfx::Rect(gfx::ToRoundedInt(rect_f.x()),
                    gfx::ToRoundedInt(rect_f.y()),
                    gfx::ToRoundedInt(rect_f.width()),
                    gfx::ToRoundedInt(rect_f.height()));
 }
 
 void NinePatchLayerLayoutTest(const gfx::Size& bitmap_size,
                               const gfx::Rect& aperture_rect,
                               const gfx::Size& layer_size,
                               const gfx::Rect& border,
-                              const gfx::Rect& occlusion,
                               bool fill_center,
                               size_t expected_quad_size) {
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
   gfx::Rect visible_layer_rect(layer_size);
-  gfx::Rect expected_layer_remaining;
-  gfx::Rect expected_tex_remaining;
-
-  if (!occlusion.IsEmpty()) {
-    expected_layer_remaining = occlusion;
-    expected_tex_remaining.SetRect(
-        occlusion.x(), occlusion.y(),
-        (bitmap_size.width() - occlusion.x()) -
-            (layer_size.width() - occlusion.right()),
-        (bitmap_size.height() - occlusion.y()) -
-            (layer_size.height() - occlusion.bottom()));
-  } else {
-    expected_layer_remaining.SetRect(border.x(), border.y(),
-                                     layer_size.width() - border.width(),
-                                     layer_size.height() - border.height());
-    expected_tex_remaining = aperture_rect;
-  }
+  gfx::Rect expected_remaining(border.x(),
+                               border.y(),
+                               layer_size.width() - border.width(),
+                               layer_size.height() - border.height());
 
   FakeImplTaskRunnerProvider task_runner_provider;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();
   FakeUIResourceLayerTreeHostImpl host_impl(
       &task_runner_provider, &shared_bitmap_manager, &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(output_surface.get());
 
   std::unique_ptr<NinePatchLayerImpl> layer =
       NinePatchLayerImpl::Create(host_impl.active_tree(), 1);
   layer->draw_properties().visible_layer_rect = visible_layer_rect;
   layer->SetBounds(layer_size);
   layer->SetForceRenderSurface(true);
 
   UIResourceId uid = 1;
   bool is_opaque = false;
   UIResourceBitmap bitmap(bitmap_size, is_opaque);
 
   host_impl.CreateUIResource(uid, bitmap);
   layer->SetUIResourceId(uid);
   layer->SetImageBounds(bitmap_size);
-  layer->SetLayout(aperture_rect, border, occlusion, fill_center, false);
+  layer->SetLayout(aperture_rect, border, fill_center, false);
   AppendQuadsData data;
   layer->AppendQuads(render_pass.get(), &data);
 
   // Verify quad rects
   const QuadList& quads = render_pass->quad_list;
   EXPECT_EQ(expected_quad_size, quads.size());
 
-  Region layer_remaining(visible_layer_rect);
+  Region remaining(visible_layer_rect);
   for (auto iter = quads.cbegin(); iter != quads.cend(); ++iter) {
     gfx::Rect quad_rect = iter->rect;
 
     EXPECT_TRUE(visible_layer_rect.Contains(quad_rect)) << iter.index();
-    EXPECT_TRUE(layer_remaining.Contains(quad_rect)) << iter.index();
-    layer_remaining.Subtract(Region(quad_rect));
+    EXPECT_TRUE(remaining.Contains(quad_rect)) << iter.index();
+    remaining.Subtract(Region(quad_rect));
   }
 
   // Check if the left-over quad is the same size as the mapped aperture quad in
   // layer space.
   if (!fill_center) {
-    EXPECT_EQ(expected_layer_remaining, layer_remaining.bounds());
+    EXPECT_EQ(expected_remaining, remaining.bounds());
   } else {
-    EXPECT_TRUE(layer_remaining.bounds().IsEmpty());
+    EXPECT_TRUE(remaining.bounds().IsEmpty());
   }
 
   // Verify UV rects
   gfx::Rect bitmap_rect(bitmap_size);
   Region tex_remaining(bitmap_rect);
   for (const auto& quad : quads) {
     const TextureDrawQuad* tex_quad = TextureDrawQuad::MaterialCast(quad);
     gfx::RectF tex_rect =
         gfx::BoundingRect(tex_quad->uv_top_left, tex_quad->uv_bottom_right);
     tex_rect.Scale(bitmap_size.width(), bitmap_size.height());
     tex_remaining.Subtract(Region(ToRoundedIntRect(tex_rect)));
   }
 
   if (!fill_center) {
-    EXPECT_EQ(expected_tex_remaining, tex_remaining.bounds());
-    Region aperture_region(expected_tex_remaining);
+    EXPECT_EQ(aperture_rect, tex_remaining.bounds());
+    Region aperture_region(aperture_rect);
     EXPECT_EQ(aperture_region, tex_remaining);
   } else {
-    EXPECT_TRUE(layer_remaining.bounds().IsEmpty());
+    EXPECT_TRUE(remaining.bounds().IsEmpty());
   }
 }
 
 TEST(NinePatchLayerImplTest, VerifyDrawQuads) {
   // Input is a 100x100 bitmap with a 40x50 aperture at x=20, y=30.
   // The bounds of the layer are set to 400x400.
   gfx::Size bitmap_size(100, 100);
   gfx::Size layer_size(400, 500);
   gfx::Rect aperture_rect(20, 30, 40, 50);
   gfx::Rect border(40, 40, 80, 80);
   bool fill_center = false;
   size_t expected_quad_size = 8;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 
   // The bounds of the layer are set to less than the bitmap size.
   bitmap_size = gfx::Size(100, 100);
   layer_size = gfx::Size(40, 50);
   aperture_rect = gfx::Rect(20, 30, 40, 50);
   border = gfx::Rect(10, 10, 25, 15);
   fill_center = true;
   expected_quad_size = 9;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 
   // Layer and image sizes are equal.
   bitmap_size = gfx::Size(100, 100);
   layer_size = gfx::Size(100, 100);
   aperture_rect = gfx::Rect(20, 30, 40, 50);
   border = gfx::Rect(20, 30, 40, 50);
   fill_center = true;
   expected_quad_size = 9;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
-}
-
-TEST(NinePatchLayerImplTest, VerifyDrawQuadsWithOcclusion) {
-  // Input is a 100x100 bitmap with a 40x50 aperture at x=20, y=30.
-  // The bounds of the layer are set to 400x400.
-  gfx::Size bitmap_size(100, 100);
-  gfx::Rect aperture_rect(30, 30, 40, 40);
-  gfx::Size layer_size(400, 400);
-  gfx::Rect occlusion(20, 20, 360, 360);
-  bool fill_center = false;
-  size_t expected_quad_size = 12;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, gfx::Rect(),
-                           occlusion, fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 }
 
 TEST(NinePatchLayerImplTest, VerifyDrawQuadsWithEmptyPatches) {
   // The top component of the 9-patch is empty, so there should be no quads for
   // the top three components.
   gfx::Size bitmap_size(100, 100);
   gfx::Size layer_size(100, 100);
   gfx::Rect aperture_rect(10, 0, 80, 90);
   gfx::Rect border(10, 0, 20, 10);
   bool fill_center = false;
   size_t expected_quad_size = 5;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 
   // The top and left components of the 9-patch are empty, so there should be no
   // quads for the left and top components.
   bitmap_size = gfx::Size(100, 100);
   layer_size = gfx::Size(100, 100);
   aperture_rect = gfx::Rect(0, 0, 90, 90);
   border = gfx::Rect(0, 0, 10, 10);
   fill_center = false;
   expected_quad_size = 3;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 
   // The aperture is the size of the bitmap and the center doesn't draw.
   bitmap_size = gfx::Size(100, 100);
   layer_size = gfx::Size(100, 100);
   aperture_rect = gfx::Rect(0, 0, 100, 100);
   border = gfx::Rect(0, 0, 0, 0);
   fill_center = false;
   expected_quad_size = 0;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 
   // The aperture is the size of the bitmap and the center does draw.
   bitmap_size = gfx::Size(100, 100);
   layer_size = gfx::Size(100, 100);
   aperture_rect = gfx::Rect(0, 0, 100, 100);
   border = gfx::Rect(0, 0, 0, 0);
   fill_center = true;
   expected_quad_size = 1;
-  NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
-                           gfx::Rect(), fill_center, expected_quad_size);
+  NinePatchLayerLayoutTest(bitmap_size,
+                           aperture_rect,
+                           layer_size,
+                           border,
+                           fill_center,
+                           expected_quad_size);
 }
 
 TEST(NinePatchLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
 
   SkBitmap sk_bitmap;
   sk_bitmap.allocN32Pixels(10, 10);
   sk_bitmap.setImmutable();
   UIResourceId uid = 5;
   UIResourceBitmap bitmap(sk_bitmap);
   impl.host_impl()->CreateUIResource(uid, bitmap);
 
   NinePatchLayerImpl* nine_patch_layer_impl =
       impl.AddChildToRoot<NinePatchLayerImpl>();
   nine_patch_layer_impl->SetBounds(layer_size);
   nine_patch_layer_impl->SetDrawsContent(true);
   nine_patch_layer_impl->SetUIResourceId(uid);
   nine_patch_layer_impl->SetImageBounds(gfx::Size(10, 10));
 
   gfx::Rect aperture = gfx::Rect(3, 3, 4, 4);
   gfx::Rect border = gfx::Rect(300, 300, 400, 400);
-  nine_patch_layer_impl->SetLayout(aperture, border, gfx::Rect(), true, false);
+  nine_patch_layer_impl->SetLayout(aperture, border, true, false);
 
   impl.CalcDrawProps(viewport_size);
 
   {
     SCOPED_TRACE("No occlusion");
     gfx::Rect occluded;
     impl.AppendQuadsWithOcclusion(nine_patch_layer_impl, occluded);
 
     LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(),
                                                  gfx::Rect(layer_size));
@@ skipping 57 matching lines @@
   impl.CalcDrawProps(viewport_size);
 
   {
     SCOPED_TRACE("Use opaque image");
 
     nine_patch_layer_impl->SetUIResourceId(uid_opaque);
     nine_patch_layer_impl->SetImageBounds(gfx::Size(10, 10));
 
     gfx::Rect aperture = gfx::Rect(3, 3, 4, 4);
     gfx::Rect border = gfx::Rect(300, 300, 400, 400);
-    nine_patch_layer_impl->SetLayout(aperture, border, gfx::Rect(), true,
-                                     false);
+    nine_patch_layer_impl->SetLayout(aperture, border, true, false);
 
     impl.AppendQuadsWithOcclusion(nine_patch_layer_impl, gfx::Rect());
 
     const QuadList &quad_list = impl.quad_list();
     for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin();
          it != quad_list.BackToFrontEnd(); ++it)
       EXPECT_FALSE(it->ShouldDrawWithBlending());
   }
 
   {
     SCOPED_TRACE("Use tranparent image");
 
     nine_patch_layer_impl->SetUIResourceId(uid_alpha);
 
     impl.AppendQuadsWithOcclusion(nine_patch_layer_impl, gfx::Rect());
 
     const QuadList &quad_list = impl.quad_list();
     for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin();
          it != quad_list.BackToFrontEnd(); ++it)
       EXPECT_TRUE(it->ShouldDrawWithBlending());
   }
 }
 
 }  // namespace
 }  // namespace cc