Revert of Add effect node support in PaintArtifactCompositor for layer list mode [4/4]

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 "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/trees/clip_node.h"
-#include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "platform/graphics/paint/EffectPaintPropertyNode.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/testing/PictureMatchers.h"
 #include "platform/testing/TestPaintArtifact.h"
 #include "platform/testing/WebLayerTreeViewImplForTesting.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 namespace {
 
 using ::testing::Pointee;
 
 gfx::Transform translation(SkMScalar x, SkMScalar y)
 {
     gfx::Transform transform;
     transform.Translate(x, y);
     return transform;
 }
 
-EffectPaintPropertyNode* dummyRootEffect()
-{
-    DEFINE_STATIC_REF(EffectPaintPropertyNode, node, EffectPaintPropertyNode::create(1.0));
-    return node;
-}
-
 class PaintArtifactCompositorTest : public ::testing::Test {
 protected:
     void SetUp() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
 
         // Delay constructing the compositor until after the feature is set.
         m_paintArtifactCompositor = wrapUnique(new PaintArtifactCompositor);
         m_paintArtifactCompositor->enableExtraDataForTesting();
     }
@@ skipping 44 matching lines @@
     EXPECT_EQ(gfx::Size(100, 100), child->bounds());
 }
 
 TEST_F(PaintArtifactCompositorTest, OneTransform)
 {
     // A 90 degree clockwise rotation about (100, 100).
     RefPtr<TransformPaintPropertyNode> transform = TransformPaintPropertyNode::create(
         TransformationMatrix().rotate(90), FloatPoint3D(100, 100, 0));
 
     TestPaintArtifact artifact;
-    artifact.chunk(transform, nullptr, dummyRootEffect())
+    artifact.chunk(transform, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 100, 100), Color::white);
-    artifact.chunk(nullptr, nullptr, dummyRootEffect())
+    artifact.chunk(nullptr, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 100, 100), Color::gray);
-    artifact.chunk(transform, nullptr, dummyRootEffect())
+    artifact.chunk(transform, nullptr, nullptr)
         .rectDrawing(FloatRect(100, 100, 200, 100), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(3u, rootLayer()->children().size());
     {
         const cc::Layer* layer = rootLayer()->child_at(0);
         EXPECT_THAT(layer->GetPicture(),
             Pointee(drawsRectangle(FloatRect(0, 0, 100, 100), Color::white)));
         gfx::RectF mappedRect(0, 0, 100, 100);
         layer->transform().TransformRect(&mappedRect);
@@ skipping 17 matching lines @@
 
 TEST_F(PaintArtifactCompositorTest, TransformCombining)
 {
     // A translation by (5, 5) within a 2x scale about (10, 10).
     RefPtr<TransformPaintPropertyNode> transform1 = TransformPaintPropertyNode::create(
         TransformationMatrix().scale(2), FloatPoint3D(10, 10, 0));
     RefPtr<TransformPaintPropertyNode> transform2 = TransformPaintPropertyNode::create(
         TransformationMatrix().translate(5, 5), FloatPoint3D(), transform1);
 
     TestPaintArtifact artifact;
-    artifact.chunk(transform1, nullptr, dummyRootEffect())
+    artifact.chunk(transform1, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 300, 200), Color::white);
-    artifact.chunk(transform2, nullptr, dummyRootEffect())
+    artifact.chunk(transform2, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 300, 200), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(2u, rootLayer()->children().size());
     {
         const cc::Layer* layer = rootLayer()->child_at(0);
         EXPECT_THAT(layer->GetPicture(),
             Pointee(drawsRectangle(FloatRect(0, 0, 300, 200), Color::white)));
         gfx::RectF mappedRect(0, 0, 300, 200);
         layer->transform().TransformRect(&mappedRect);
@@ skipping 61 matching lines @@
 }
 
 TEST_F(PaintArtifactCompositorTest, NestedClips)
 {
     RefPtr<ClipPaintPropertyNode> clip1 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(100, 100, 700, 700));
     RefPtr<ClipPaintPropertyNode> clip2 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(200, 200, 700, 100), clip1);
 
     TestPaintArtifact artifact;
-    artifact.chunk(nullptr, clip1, dummyRootEffect())
+    artifact.chunk(nullptr, clip1, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::white);
-    artifact.chunk(nullptr, clip2, dummyRootEffect())
+    artifact.chunk(nullptr, clip2, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::lightGray);
-    artifact.chunk(nullptr, clip1, dummyRootEffect())
+    artifact.chunk(nullptr, clip1, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::darkGray);
-    artifact.chunk(nullptr, clip2, dummyRootEffect())
+    artifact.chunk(nullptr, clip2, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(1u, rootLayer()->children().size());
     cc::Layer* clipLayer1 = rootLayer()->child_at(0);
     EXPECT_TRUE(clipLayer1->masks_to_bounds());
     EXPECT_EQ(gfx::Size(700, 700), clipLayer1->bounds());
     EXPECT_EQ(translation(100, 100), clipLayer1->transform());
 
     ASSERT_EQ(4u, clipLayer1->children().size());
@@ skipping 199 matching lines @@
     EXPECT_EQ(gfx::Size(100, 100), child->bounds());
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, OneTransform)
 {
     // A 90 degree clockwise rotation about (100, 100).
     RefPtr<TransformPaintPropertyNode> transform = TransformPaintPropertyNode::create(
         TransformationMatrix().rotate(90), FloatPoint3D(100, 100, 0));
 
     TestPaintArtifact artifact;
-    artifact.chunk(transform, nullptr, dummyRootEffect())
+    artifact.chunk(transform, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 100, 100), Color::white);
-    artifact.chunk(nullptr, nullptr, dummyRootEffect())
+    artifact.chunk(nullptr, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 100, 100), Color::gray);
-    artifact.chunk(transform, nullptr, dummyRootEffect())
+    artifact.chunk(transform, nullptr, nullptr)
         .rectDrawing(FloatRect(100, 100, 200, 100), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(3u, contentLayerCount());
     {
         const cc::Layer* layer = contentLayerAt(0);
         EXPECT_THAT(layer->GetPicture(),
             Pointee(drawsRectangle(FloatRect(0, 0, 100, 100), Color::white)));
         gfx::RectF mappedRect(0, 0, 100, 100);
         layer->screen_space_transform().TransformRect(&mappedRect);
@@ skipping 17 matching lines @@
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, TransformCombining)
 {
     // A translation by (5, 5) within a 2x scale about (10, 10).
     RefPtr<TransformPaintPropertyNode> transform1 = TransformPaintPropertyNode::create(
         TransformationMatrix().scale(2), FloatPoint3D(10, 10, 0));
     RefPtr<TransformPaintPropertyNode> transform2 = TransformPaintPropertyNode::create(
         TransformationMatrix().translate(5, 5), FloatPoint3D(), transform1);
 
     TestPaintArtifact artifact;
-    artifact.chunk(transform1, nullptr, dummyRootEffect())
+    artifact.chunk(transform1, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 300, 200), Color::white);
-    artifact.chunk(transform2, nullptr, dummyRootEffect())
+    artifact.chunk(transform2, nullptr, nullptr)
         .rectDrawing(FloatRect(0, 0, 300, 200), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(2u, contentLayerCount());
     {
         const cc::Layer* layer = contentLayerAt(0);
         EXPECT_THAT(layer->GetPicture(),
             Pointee(drawsRectangle(FloatRect(0, 0, 300, 200), Color::white)));
         gfx::RectF mappedRect(0, 0, 300, 200);
         layer->screen_space_transform().TransformRect(&mappedRect);
@@ skipping 35 matching lines @@
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedClips)
 {
     RefPtr<ClipPaintPropertyNode> clip1 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(100, 100, 700, 700));
     RefPtr<ClipPaintPropertyNode> clip2 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(200, 200, 700, 100), clip1);
 
     TestPaintArtifact artifact;
-    artifact.chunk(nullptr, clip1, dummyRootEffect())
+    artifact.chunk(nullptr, clip1, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::white);
-    artifact.chunk(nullptr, clip2, dummyRootEffect())
+    artifact.chunk(nullptr, clip2, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::lightGray);
-    artifact.chunk(nullptr, clip1, dummyRootEffect())
+    artifact.chunk(nullptr, clip1, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::darkGray);
-    artifact.chunk(nullptr, clip2, dummyRootEffect())
+    artifact.chunk(nullptr, clip2, nullptr)
         .rectDrawing(FloatRect(300, 350, 100, 100), Color::black);
     update(artifact.build());
 
     ASSERT_EQ(4u, contentLayerCount());
 
     const cc::Layer* whiteLayer = contentLayerAt(0);
     EXPECT_THAT(whiteLayer->GetPicture(),
         Pointee(drawsRectangle(FloatRect(0, 0, 100, 100), Color::white)));
     EXPECT_EQ(translation(300, 350), whiteLayer->screen_space_transform());
 
@@ skipping 29 matching lines @@
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, DeeplyNestedClips)
 {
     Vector<RefPtr<ClipPaintPropertyNode>> clips;
     for (unsigned i = 1; i <= 10; i++) {
         clips.append(ClipPaintPropertyNode::create(
             nullptr, FloatRoundedRect(5 * i, 0, 100, 200 - 10 * i),
             clips.isEmpty() ? nullptr : clips.last()));
     }
 
     TestPaintArtifact artifact;
-    artifact.chunk(nullptr, clips.last(), dummyRootEffect())
+    artifact.chunk(nullptr, clips.last(), nullptr)
         .rectDrawing(FloatRect(0, 0, 200, 200), Color::white);
     update(artifact.build());
 
     // Check the drawing layer.
     ASSERT_EQ(1u, contentLayerCount());
     const cc::Layer* drawingLayer = contentLayerAt(0);
     EXPECT_THAT(drawingLayer->GetPicture(),
         Pointee(drawsRectangle(FloatRect(0, 0, 200, 200), Color::white)));
     EXPECT_EQ(gfx::Transform(), drawingLayer->screen_space_transform());
 
@@ skipping 11 matching lines @@
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SiblingClips)
 {
     RefPtr<ClipPaintPropertyNode> commonClip = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(0, 0, 800, 600));
     RefPtr<ClipPaintPropertyNode> clip1 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(0, 0, 400, 600), commonClip);
     RefPtr<ClipPaintPropertyNode> clip2 = ClipPaintPropertyNode::create(
         nullptr, FloatRoundedRect(400, 0, 400, 600), commonClip);
 
     TestPaintArtifact artifact;
-    artifact.chunk(nullptr, clip1, dummyRootEffect())
+    artifact.chunk(nullptr, clip1, nullptr)
         .rectDrawing(FloatRect(0, 0, 640, 480), Color::white);
-    artifact.chunk(nullptr, clip2, dummyRootEffect())
+    artifact.chunk(nullptr, clip2, nullptr)
         .rectDrawing(FloatRect(0, 0, 640, 480), Color::black);
     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());
@@ skipping 25 matching lines @@
     artifact.chunk(PaintChunkProperties())
         .foreignLayer(FloatPoint(50, 100), IntSize(400, 300), layer);
     update(artifact.build());
 
     ASSERT_EQ(1u, contentLayerCount());
     EXPECT_EQ(layer, contentLayerAt(0));
     EXPECT_EQ(gfx::Size(400, 300), layer->bounds());
     EXPECT_EQ(translation(50, 100), layer->screen_space_transform());
 }
 
-TEST_F(PaintArtifactCompositorTestWithPropertyTrees, EffectTreeConversion)
-{
-    RefPtr<EffectPaintPropertyNode> effect1 = EffectPaintPropertyNode::create(0.5, dummyRootEffect());
-    RefPtr<EffectPaintPropertyNode> effect2 = EffectPaintPropertyNode::create(0.3, effect1.get());
-    RefPtr<EffectPaintPropertyNode> effect3 = EffectPaintPropertyNode::create(0.2, dummyRootEffect());
-
-    TestPaintArtifact artifact;
-    artifact.chunk(nullptr, nullptr, effect2.get())
-        .rectDrawing(FloatRect(0, 0, 100, 100), Color::white);
-    artifact.chunk(nullptr, nullptr, effect1.get())
-        .rectDrawing(FloatRect(0, 0, 100, 100), Color::white);
-    artifact.chunk(nullptr, nullptr, effect3.get())
-        .rectDrawing(FloatRect(0, 0, 100, 100), Color::white);
-    update(artifact.build());
-
-    ASSERT_EQ(3u, contentLayerCount());
-
-    const cc::EffectTree& effectTree = propertyTrees().effect_tree;
-    // Node #0 reserved for null; #1 for root render surface; #2 for dummyRootEffect,
-    // plus 3 nodes for those created by this test.
-    ASSERT_EQ(6u, effectTree.size());
-
-    const cc::EffectNode& convertedDummyRootEffect = *effectTree.Node(2);
-    EXPECT_EQ(1, convertedDummyRootEffect.parent_id);
-
-    const cc::EffectNode& convertedEffect1 = *effectTree.Node(3);
-    EXPECT_EQ(convertedDummyRootEffect.id, convertedEffect1.parent_id);
-    EXPECT_FLOAT_EQ(0.5, convertedEffect1.opacity);
-
-    const cc::EffectNode& convertedEffect2 = *effectTree.Node(4);
-    EXPECT_EQ(convertedEffect1.id, convertedEffect2.parent_id);
-    EXPECT_FLOAT_EQ(0.3, convertedEffect2.opacity);
-
-    const cc::EffectNode& convertedEffect3 = *effectTree.Node(5);
-    EXPECT_EQ(convertedDummyRootEffect.id, convertedEffect3.parent_id);
-    EXPECT_FLOAT_EQ(0.2, convertedEffect3.opacity);
-
-    EXPECT_EQ(convertedEffect2.id, contentLayerAt(0)->effect_tree_index());
-    EXPECT_EQ(convertedEffect1.id, contentLayerAt(1)->effect_tree_index());
-    EXPECT_EQ(convertedEffect3.id, contentLayerAt(2)->effect_tree_index());
-}
-
 } // namespace
 } // namespace blink