cc: Calculate visible rect inside non root copy request

cc/trees/layer_tree_host_common_unittest.cc

 // Copyright 2011 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/layer_tree_host_common.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 5751 matching lines @@
   ASSERT_EQ(2u, render_surface_layer_list.size());
   EXPECT_EQ(root_layer->id(), render_surface_layer_list.at(0)->id());
 
   // The root render surface should only have 2 contributing layer, since the
   // other layers are empty/clipped away.
   ASSERT_EQ(2u, root_layer->render_surface()->layer_list().size());
   EXPECT_EQ(root_layer->id(),
             root_layer->render_surface()->layer_list().at(0)->id());
 }
 
+TEST_F(LayerTreeHostCommonTest, VisibleRectInNonRootCopyRequest) {
+  FakeImplTaskRunnerProvider task_runner_provider;
+  TestSharedBitmapManager shared_bitmap_manager;
+  TestTaskGraphRunner task_graph_runner;
+  FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
+                                  &task_graph_runner);
+  host_impl.CreatePendingTree();

[ajuma, 2016/06/14 15:09:53]

Is this needed? It looks like the test is only using the active tree.

[weiliangc, 2016/06/15 12:27:57]

Removed.

+  const gfx::Transform identity_matrix;
+
+  LayerImpl* root = root_layer();
+  SetLayerPropertiesForTesting(root, identity_matrix, gfx::Point3F(),
+                               gfx::PointF(), gfx::Size(50, 50), true, false,
+                               true);
+  root->SetDrawsContent(true);
+  root->SetMasksToBounds(true);
+
+  LayerImpl* copy_layer = AddChild<LayerImpl>(root);
+  SetLayerPropertiesForTesting(copy_layer, identity_matrix, gfx::Point3F(),
+                               gfx::PointF(), gfx::Size(100, 100), true, false,
+                               true);
+  copy_layer->SetDrawsContent(true);

[ajuma, 2016/06/14 15:25:17]

It be worth including a test where the copy_layer itself masks to bounds, to
show that clip is applied when computing visible rects.

[weiliangc, 2016/06/15 12:27:57]

Done.

+
+  LayerImpl* copy_child = AddChild<LayerImpl>(copy_layer);
+  SetLayerPropertiesForTesting(copy_child, identity_matrix, gfx::Point3F(),
+                               gfx::PointF(40, 40), gfx::Size(20, 20), true,
+                               false, false);
+  copy_child->SetDrawsContent(true);
+
+  LayerImpl* copy_clip = AddChild<LayerImpl>(copy_layer);
+  SetLayerPropertiesForTesting(copy_clip, identity_matrix, gfx::Point3F(),
+                               gfx::PointF(), gfx::Size(55, 55), true, false,
+                               false);
+  copy_clip->SetMasksToBounds(true);
+
+  LayerImpl* copy_clipped_child = AddChild<LayerImpl>(copy_clip);
+  SetLayerPropertiesForTesting(copy_clipped_child, identity_matrix,
+                               gfx::Point3F(), gfx::PointF(40, 40),
+                               gfx::Size(20, 20), true, false, false);
+  copy_clipped_child->SetDrawsContent(true);
+
+  LayerImpl* copy_surface = AddChild<LayerImpl>(copy_clip);
+  SetLayerPropertiesForTesting(copy_surface, identity_matrix, gfx::Point3F(),
+                               gfx::PointF(45, 45), gfx::Size(20, 20), true,
+                               false, true);
+  copy_surface->SetDrawsContent(true);
+
+  copy_layer->test_properties()->copy_requests.push_back(
+      CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
+
+  ExecuteCalculateDrawProperties(root);
+
+  EXPECT_EQ(gfx::Rect(100, 100), copy_layer->visible_layer_rect());
+  EXPECT_EQ(gfx::Rect(20, 20), copy_child->visible_layer_rect());
+  EXPECT_EQ(gfx::Rect(15, 15), copy_clipped_child->visible_layer_rect());
+  EXPECT_EQ(gfx::Rect(10, 10), copy_surface->visible_layer_rect());
+}
+
 TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) {
   LayerImpl* root = root_layer();
   LayerImpl* surface = AddChild<LayerImpl>(root);
   LayerImpl* surface_child = AddChild<LayerImpl>(surface);
 
   const gfx::Transform identity_matrix;
   SetLayerPropertiesForTesting(root, identity_matrix, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(50, 50), true, false,
                                true);
   SetLayerPropertiesForTesting(surface, identity_matrix, gfx::Point3F(),
@@ skipping 4479 matching lines @@
   EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index());
   EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index());
 }
 
 }  // namespace
 }  // namespace cc