cc : Clean up cc clip tree

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include <memory>
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 400 matching lines @@
 
   ASSERT_EQ(1u, contentLayerCount());
   const cc::Layer* layer = contentLayerAt(0);
   EXPECT_THAT(layer->GetPicture(),
               Pointee(drawsRectangle(FloatRect(0, 0, 300, 200), Color::black)));
   EXPECT_EQ(translation(220, 80), layer->screen_space_transform());
 
   const cc::ClipNode* clipNode =
       propertyTrees().clip_tree.Node(layer->clip_tree_index());
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, clipNode->clip_type);
-  EXPECT_TRUE(clipNode->layers_are_clipped);

[chrishtr, 2017/03/21 18:06:30]

Why did these change? Is this concept irrelevanat now?

[jaydasika, 2017/03/21 18:18:33]

This field decides whether a layer is clipped. It is now computed dynamically
while computing layer's draw properties(along with computing the layer's clip
rect).  So, its not needed in clip nodes anymore.

   EXPECT_EQ(gfx::RectF(100, 100, 300, 200), clipNode->clip);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedClips) {
   RefPtr<ClipPaintPropertyNode> clip1 = ClipPaintPropertyNode::create(
       ClipPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
       FloatRoundedRect(100, 100, 700, 700),
       CompositingReasonOverflowScrollingTouch);
   RefPtr<ClipPaintPropertyNode> clip2 =
       ClipPaintPropertyNode::create(clip1, TransformPaintPropertyNode::root(),
@@ skipping 40 matching lines @@
 
   const cc::Layer* blackLayer = contentLayerAt(3);
   EXPECT_THAT(blackLayer->GetPicture(),
               Pointee(drawsRectangle(FloatRect(0, 0, 100, 100), Color::black)));
   EXPECT_EQ(translation(300, 350), blackLayer->screen_space_transform());
 
   EXPECT_EQ(whiteLayer->clip_tree_index(), darkGrayLayer->clip_tree_index());
   const cc::ClipNode* outerClip =
       propertyTrees().clip_tree.Node(whiteLayer->clip_tree_index());
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, outerClip->clip_type);
-  EXPECT_TRUE(outerClip->layers_are_clipped);
   EXPECT_EQ(gfx::RectF(100, 100, 700, 700), outerClip->clip);
 
   EXPECT_EQ(lightGrayLayer->clip_tree_index(), blackLayer->clip_tree_index());
   const cc::ClipNode* innerClip =
       propertyTrees().clip_tree.Node(blackLayer->clip_tree_index());
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, innerClip->clip_type);
-  EXPECT_TRUE(innerClip->layers_are_clipped);
   EXPECT_EQ(gfx::RectF(200, 200, 700, 700), innerClip->clip);
   EXPECT_EQ(outerClip->id, innerClip->parent_id);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, DeeplyNestedClips) {
   Vector<RefPtr<ClipPaintPropertyNode>> clips;
   for (unsigned i = 1; i <= 10; i++) {
     clips.push_back(ClipPaintPropertyNode::create(
         clips.isEmpty() ? ClipPaintPropertyNode::root() : clips.back(),
         TransformPaintPropertyNode::root(),
@@ skipping 13 matching lines @@
   EXPECT_THAT(drawingLayer->GetPicture(),
               Pointee(drawsRectangle(FloatRect(0, 0, 200, 200), Color::white)));
   EXPECT_EQ(gfx::Transform(), drawingLayer->screen_space_transform());
 
   // Check the clip nodes.
   const cc::ClipNode* clipNode =
       propertyTrees().clip_tree.Node(drawingLayer->clip_tree_index());
   for (auto it = clips.rbegin(); it != clips.rend(); ++it) {
     const ClipPaintPropertyNode* paintClipNode = it->get();
     EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, clipNode->clip_type);
-    EXPECT_TRUE(clipNode->layers_are_clipped);
     EXPECT_EQ(paintClipNode->clipRect().rect(), clipNode->clip);
     clipNode = propertyTrees().clip_tree.Node(clipNode->parent_id);
   }
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SiblingClips) {
   RefPtr<ClipPaintPropertyNode> commonClip = ClipPaintPropertyNode::create(
       ClipPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
       FloatRoundedRect(0, 0, 800, 600));
   RefPtr<ClipPaintPropertyNode> clip1 = ClipPaintPropertyNode::create(
@@ skipping 15 matching lines @@
   update(artifact.build());
   ASSERT_EQ(2u, contentLayerCount());
 
   const cc::Layer* whiteLayer = contentLayerAt(0);
   EXPECT_THAT(whiteLayer->GetPicture(),
               Pointee(drawsRectangle(FloatRect(0, 0, 640, 480), Color::white)));
   EXPECT_EQ(gfx::Transform(), whiteLayer->screen_space_transform());
   const cc::ClipNode* whiteClip =
       propertyTrees().clip_tree.Node(whiteLayer->clip_tree_index());
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, whiteClip->clip_type);
-  EXPECT_TRUE(whiteClip->layers_are_clipped);
   ASSERT_EQ(gfx::RectF(0, 0, 400, 600), whiteClip->clip);
 
   const cc::Layer* blackLayer = contentLayerAt(1);
   EXPECT_THAT(blackLayer->GetPicture(),
               Pointee(drawsRectangle(FloatRect(0, 0, 640, 480), Color::black)));
   EXPECT_EQ(gfx::Transform(), blackLayer->screen_space_transform());
   const cc::ClipNode* blackClip =
       propertyTrees().clip_tree.Node(blackLayer->clip_tree_index());
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP, blackClip->clip_type);
-  EXPECT_TRUE(blackClip->layers_are_clipped);
   ASSERT_EQ(gfx::RectF(400, 0, 400, 600), blackClip->clip);
 
   EXPECT_EQ(whiteClip->parent_id, blackClip->parent_id);
   const cc::ClipNode* commonClipNode =
       propertyTrees().clip_tree.Node(whiteClip->parent_id);
   EXPECT_EQ(cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP,
             commonClipNode->clip_type);
-  EXPECT_TRUE(commonClipNode->layers_are_clipped);
   ASSERT_EQ(gfx::RectF(0, 0, 800, 600), commonClipNode->clip);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees,
        ForeignLayerPassesThrough) {
   scoped_refptr<cc::Layer> layer = cc::Layer::Create();
 
   TestPaintArtifact testArtifact;
   testArtifact
       .chunk(TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
@@ skipping 1391 matching lines @@
   EXPECT_EQ(gfx::Size(50, 50), layer3->bounds());
   EXPECT_EQ(effectNode->id, layer3->effect_tree_index());
 
   const cc::Layer* layer4 = contentLayerAt(3);
   EXPECT_EQ(gfx::Vector2dF(100.f, 0.f), layer4->offset_to_transform_parent());
   EXPECT_EQ(gfx::Size(150, 150), layer4->bounds());
   EXPECT_EQ(1, layer4->effect_tree_index());
 }
 
 }  // namespace blink