cc: Remove the opaque rect return-parameter from ContentLayerClient.

cc/layers/tiled_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 "cc/layers/tiled_layer_impl.h"
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 35 matching lines @@
   // visibility of the entire layer size.
   scoped_ptr<TiledLayerImpl> CreateLayer(
       const gfx::Size& tile_size,
       const gfx::Size& layer_size,
       LayerTilingData::BorderTexelOption border_texels) {
     scoped_ptr<TiledLayerImpl> layer =
         CreateLayerNoTiles(tile_size, layer_size, border_texels);
 
     ResourceProvider::ResourceId resource_id = 1;
     for (int i = 0; i < layer->TilingForTesting()->num_tiles_x(); ++i) {
-      for (int j = 0; j < layer->TilingForTesting()->num_tiles_y(); ++j) {
-        gfx::Rect opaque_rect(
-            layer->TilingForTesting()->tile_bounds(i, j).origin(),
-            gfx::Size(1, 1));
-        layer->PushTileProperties(i, j, resource_id++, opaque_rect, false);
-      }
+      for (int j = 0; j < layer->TilingForTesting()->num_tiles_y(); ++j)
+        layer->PushTileProperties(i, j, resource_id++, false);
     }
 
     return layer.Pass();
   }
 
   void GetQuads(RenderPass* render_pass,
                 const gfx::Size& tile_size,
                 const gfx::Size& layer_size,
                 LayerTilingData::BorderTexelOption border_texel_option,
                 const gfx::Rect& visible_content_rect) {
@@ skipping 99 matching lines @@
     layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
     EXPECT_EQ(render_pass->quad_list.size(), 4u);
     EXPECT_EQ(0u, data.num_missing_tiles);
 
     for (size_t i = 0; i < render_pass->quad_list.size(); ++i)
       EXPECT_EQ(render_pass->quad_list[i]->material, DrawQuad::TILED_CONTENT);
   }
 
   for (int i = 0; i < num_tiles_x; ++i)
     for (int j = 0; j < num_tiles_y; ++j)
-      layer->PushTileProperties(i, j, 0, gfx::Rect(), false);
+      layer->PushTileProperties(i, j, 0, false);
 
   // All checkerboarding
   {
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
 
     AppendQuadsData data;
     layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
     EXPECT_LT(0u, data.num_missing_tiles);
     EXPECT_EQ(render_pass->quad_list.size(), 4u);
@@ skipping 76 matching lines @@
 
   for (size_t i = 0; i < render_pass->quad_list.size(); ++i) {
     const TileDrawQuad* quad =
         TileDrawQuad::MaterialCast(render_pass->quad_list[i]);
 
     EXPECT_NE(0u, quad->resource_id) << LayerTestCommon::quad_string << i;
     EXPECT_EQ(gfx::RectF(gfx::PointF(), tile_size), quad->tex_coord_rect)
         << LayerTestCommon::quad_string << i;
     EXPECT_EQ(tile_size, quad->texture_size) << LayerTestCommon::quad_string
                                              << i;
-    EXPECT_EQ(gfx::Size(1, 1).ToString(), quad->opaque_rect.size().ToString())
-        << LayerTestCommon::quad_string << i;
   }
 }
 
 TEST_F(TiledLayerImplTest, GPUMemoryUsage) {
   gfx::Size tile_size(20, 30);
   int num_tiles_x = 12;
   int num_tiles_y = 32;
   gfx::Size layer_size(tile_size.width() * num_tiles_x,
                        tile_size.height() * num_tiles_y);
 
   scoped_ptr<TiledLayerImpl> layer = CreateLayerNoTiles(
       tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
 
   EXPECT_EQ(layer->GPUMemoryUsageInBytes(), 0u);
 
   ResourceProvider::ResourceId resource_id = 1;
-  layer->PushTileProperties(0, 1, resource_id++, gfx::Rect(0, 0, 1, 1), false);
-  layer->PushTileProperties(2, 3, resource_id++, gfx::Rect(0, 0, 1, 1), false);
-  layer->PushTileProperties(2, 0, resource_id++, gfx::Rect(0, 0, 1, 1), false);
+  layer->PushTileProperties(0, 1, resource_id++, false);
+  layer->PushTileProperties(2, 3, resource_id++, false);
+  layer->PushTileProperties(2, 0, resource_id++, false);
 
   EXPECT_EQ(
       layer->GPUMemoryUsageInBytes(),
       static_cast<size_t>(3 * 4 * tile_size.width() * tile_size.height()));
 
   ResourceProvider::ResourceId empty_resource(0);
-  layer->PushTileProperties(0, 1, empty_resource, gfx::Rect(0, 0, 1, 1), false);
-  layer->PushTileProperties(2, 3, empty_resource, gfx::Rect(0, 0, 1, 1), false);
-  layer->PushTileProperties(2, 0, empty_resource, gfx::Rect(0, 0, 1, 1), false);
+  layer->PushTileProperties(0, 1, empty_resource, false);
+  layer->PushTileProperties(2, 3, empty_resource, false);
+  layer->PushTileProperties(2, 0, empty_resource, false);
 
   EXPECT_EQ(layer->GPUMemoryUsageInBytes(), 0u);
 }
 
 TEST_F(TiledLayerImplTest, EmptyMask) {
   gfx::Size tile_size(20, 20);
   gfx::Size layer_size(0, 0);
   scoped_ptr<TiledLayerImpl> layer =
       CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
 
@@ skipping 16 matching lines @@
   tiled_layer->set_skips_draw(false);
 
   scoped_ptr<LayerTilingData> tiler =
       LayerTilingData::Create(tile_size, LayerTilingData::NO_BORDER_TEXELS);
   tiler->SetTilingSize(layer_bounds);
   tiled_layer->SetTilingData(*tiler);
 
   ResourceProvider::ResourceId resource_id = 1;
   for (int i = 0; i < tiled_layer->TilingForTesting()->num_tiles_x(); ++i) {
     for (int j = 0; j < tiled_layer->TilingForTesting()->num_tiles_y(); ++j)
-      tiled_layer->PushTileProperties(i, j, resource_id++, gfx::Rect(), false);
+      tiled_layer->PushTileProperties(i, j, resource_id++, false);
   }
 
   impl.CalcDrawProps(viewport_size);
 
   {
     SCOPED_TRACE("No occlusion");
     gfx::Rect occluded;
     impl.AppendQuadsWithOcclusion(tiled_layer, occluded);
 
     LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(),
@@ skipping 22 matching lines @@
         occluded,
         &partially_occluded_count);
     // The layer outputs one quad, which is partially occluded.
     EXPECT_EQ(100u - 10u, impl.quad_list().size());
     EXPECT_EQ(10u + 10u, partially_occluded_count);
   }
 }
 
 }  // namespace
 }  // namespace cc