Set clip children in LayerTreeHostCommonTest.RenderSurfaceWithUnclippedDescendantsClipsSubtree

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 <algorithm>
 #include <set>
 
 #include "cc/animation/keyframed_animation_curve.h"
@@ skipping 7871 matching lines @@
   LayerImpl* render_surface =
       AddChild<LayerImpl>(between_clip_parent_and_child);
   LayerImpl* test_layer = AddChild<LayerImpl>(render_surface);
 
   const gfx::Transform identity_matrix;
   gfx::Transform transform;
   transform.Translate(2.0, 2.0);
 
   test_layer->SetDrawsContent(true);
   render_surface->SetClipParent(clip_parent);
+  std::set<LayerImpl*>* clip_children = new std::set<LayerImpl*>;

[ajuma, 2015/09/14 17:07:02]

Please use a scoped_ptr for this (see other unit tests that call
SetClipChildren).

+  clip_children->insert(render_surface);
+  clip_parent->SetClipChildren(clip_children);
   SetLayerPropertiesForTesting(root, identity_matrix, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(30, 30), true, false,
                                true);
   SetLayerPropertiesForTesting(clip_parent, transform, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(30, 30), true, false,
                                false);
   SetLayerPropertiesForTesting(between_clip_parent_and_child, transform,
                                gfx::Point3F(), gfx::PointF(), gfx::Size(30, 30),
                                true, false, false);
   SetLayerPropertiesForTesting(render_surface, identity_matrix, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(30, 30), true, false,
                                true);
   SetLayerPropertiesForTesting(test_layer, identity_matrix, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(30, 30), true, false,
                                false);
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_EQ(gfx::Rect(-4, -4, 30, 30), test_layer->clip_rect());
+  EXPECT_EQ(gfx::Rect(30, 30), test_layer->clip_rect());
 }
 
 }  // namespace
 }  // namespace cc