cc : Clean up cc clip tree

cc/trees/layer_tree_host_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.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 785 matching lines @@
     root_->AddChild(child_);
     layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostTest::SetupTree();
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     switch (layer_tree_host()->SourceFrameNumber()) {
       case 1:
-        // child_ should create transform, effect, clip node.
+        // child_ should create transform, effect node.
         child_->SetForceRenderSurfaceForTesting(true);
         break;
       case 2:
         // child_ should create a scroll node.
         child_->SetScrollClipLayerId(root_->id());
         break;
       case 3:
+        // child_ should create a clip node.
+        child_->SetMasksToBounds(true);
+        break;
+      case 4:
         // child_ should not create any property tree node.
+        child_->SetMasksToBounds(false);
         child_->SetForceRenderSurfaceForTesting(false);
         child_->SetScrollClipLayerId(Layer::INVALID_ID);
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     PropertyTrees* property_trees = impl->sync_tree()->property_trees();
     auto root_transform_id_to_index =
         property_trees->layer_id_to_transform_node_index.find(root_->id());
     auto child_transform_id_to_index =
         property_trees->layer_id_to_transform_node_index.find(child_->id());
     auto root_effect_id_to_index =
         property_trees->layer_id_to_effect_node_index.find(root_->id());
     auto child_effect_id_to_index =
         property_trees->layer_id_to_effect_node_index.find(child_->id());
     auto root_clip_id_to_index =
         property_trees->layer_id_to_clip_node_index.find(root_->id());
     auto child_clip_id_to_index =
         property_trees->layer_id_to_clip_node_index.find(child_->id());
     auto root_scroll_id_to_index =
         property_trees->layer_id_to_scroll_node_index.find(root_->id());
     auto child_scroll_id_to_index =
         property_trees->layer_id_to_scroll_node_index.find(child_->id());
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
-        // root_ should create every property tree node and child_ should not
-        // create any.
+        // root_ should create transform, scroll and effect tree nodes but not
+        // a clip node.
         EXPECT_NE(root_transform_id_to_index,
                   property_trees->layer_id_to_transform_node_index.end());
         EXPECT_EQ(root_transform_id_to_index->second,
                   root_->transform_tree_index());
         EXPECT_NE(root_effect_id_to_index,
                   property_trees->layer_id_to_effect_node_index.end());
         EXPECT_EQ(root_effect_id_to_index->second, root_->effect_tree_index());
-        EXPECT_NE(root_clip_id_to_index,
-                  property_trees->layer_id_to_clip_node_index.end());
-        EXPECT_EQ(root_clip_id_to_index->second, root_->clip_tree_index());
         EXPECT_NE(root_scroll_id_to_index,
                   property_trees->layer_id_to_scroll_node_index.end());
         EXPECT_EQ(root_scroll_id_to_index->second, root_->scroll_tree_index());
+        EXPECT_EQ(root_clip_id_to_index,
+                  property_trees->layer_id_to_clip_node_index.end());
         EXPECT_EQ(child_transform_id_to_index,
                   property_trees->layer_id_to_transform_node_index.end());
         EXPECT_EQ(child_effect_id_to_index,
                   property_trees->layer_id_to_effect_node_index.end());
         EXPECT_EQ(child_clip_id_to_index,
                   property_trees->layer_id_to_clip_node_index.end());
         EXPECT_EQ(child_scroll_id_to_index,
                   property_trees->layer_id_to_scroll_node_index.end());
         break;
       case 1:
-        // child_ should create a transfrom, clip, effect nodes but not a scroll
+        // child_ should create a transfrom, effect nodes but not a scroll, clip
         // node.
         EXPECT_NE(
             property_trees->layer_id_to_transform_node_index.find(child_->id()),
             property_trees->layer_id_to_transform_node_index.end());
         EXPECT_EQ(child_transform_id_to_index->second,
                   child_->transform_tree_index());
         EXPECT_NE(
             property_trees->layer_id_to_effect_node_index.find(child_->id()),
             property_trees->layer_id_to_effect_node_index.end());
         EXPECT_EQ(child_effect_id_to_index->second,
                   child_->effect_tree_index());
-        EXPECT_NE(
+        EXPECT_EQ(
             property_trees->layer_id_to_clip_node_index.find(child_->id()),
             property_trees->layer_id_to_clip_node_index.end());
-        EXPECT_EQ(child_clip_id_to_index->second, child_->clip_tree_index());
         EXPECT_EQ(
             property_trees->layer_id_to_scroll_node_index.find(child_->id()),
             property_trees->layer_id_to_scroll_node_index.end());
         break;
       case 2:
         // child_ should create a scroll node.
         EXPECT_NE(
             property_trees->layer_id_to_scroll_node_index.find(child_->id()),
             property_trees->layer_id_to_scroll_node_index.end());
         EXPECT_EQ(child_scroll_id_to_index->second,
                   child_->scroll_tree_index());
         break;
       case 3:
+        // child_ should create a clip node.
+        EXPECT_NE(
+            property_trees->layer_id_to_clip_node_index.find(child_->id()),
+            property_trees->layer_id_to_clip_node_index.end());
+        EXPECT_EQ(child_clip_id_to_index->second, child_->clip_tree_index());
+        break;
+      case 4:
         // child_ should not create any property tree nodes.
         EXPECT_EQ(
             property_trees->layer_id_to_transform_node_index.find(child_->id()),
             property_trees->layer_id_to_transform_node_index.end());
         EXPECT_EQ(
             property_trees->layer_id_to_effect_node_index.find(child_->id()),
             property_trees->layer_id_to_effect_node_index.end());
         EXPECT_EQ(
             property_trees->layer_id_to_clip_node_index.find(child_->id()),
             property_trees->layer_id_to_clip_node_index.end());
@@ skipping 6272 matching lines @@
 
  private:
   bool first_ = true;
   SkBitmap bitmap_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestQueueImageDecodeNonLazy);
 
 }  // namespace
 }  // namespace cc