cc : Clean up cc clip tree

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

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
index 3636243fa8b80a8e0459ebb2d90c835ea4b6553e..b580ccc81e60cc061945160e09bfafb97f44c7fb 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
@@ -418,7 +418,6 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, OneClip) {
   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);
 }
 
@@ -479,14 +478,12 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedClips) {
   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);
 }
@@ -520,7 +517,6 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, DeeplyNestedClips) {
   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);
   }
@@ -556,7 +552,6 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SiblingClips) {
   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);
@@ -566,7 +561,6 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SiblingClips) {
   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);
@@ -574,7 +568,6 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SiblingClips) {
       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);
 }