Refactor PaintChunkProperties to use PropertyTreeState

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

 // Copyright 2014 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/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 681 matching lines @@
                     FloatRect(200, 200, 50,
                               50)));  // |second| disappeared from the chunk.
   }
 }
 
 TEST_P(PaintControllerTest, UpdateClip) {
   FakeDisplayItemClient first("first", LayoutRect(100, 100, 150, 150));
   FakeDisplayItemClient second("second", LayoutRect(100, 100, 200, 200));
   GraphicsContext context(getPaintController());
 
+  RefPtr<ClipPaintPropertyNode> clip = ClipPaintPropertyNode::create(
+      nullptr, nullptr, FloatRoundedRect(1, 1, 2, 2));
+
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(first, clipType);
       PaintChunkProperties properties = defaultPaintChunkProperties();
-      properties.clip = ClipPaintPropertyNode::create(
-          nullptr, nullptr, FloatRoundedRect(1, 1, 2, 2));
+      properties.propertyTreeState.setClip(clip.get());
       getPaintController().updateCurrentPaintChunkProperties(&id, properties);
     }
     ClipRecorder clipRecorder(context, first, clipType, IntRect(1, 1, 2, 2));
     drawRect(context, first, backgroundDrawingType,
              FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType,
              FloatRect(100, 100, 200, 200));
   }
   getPaintController().commitNewDisplayItems();
 
@@ skipping 34 matching lines @@
                 UnorderedElementsAre(FloatRect(
                     LayoutRect::infiniteIntRect())));  // This is a new chunk.
 
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
   }
 
   second.setDisplayItemsUncached();
   drawRect(context, first, backgroundDrawingType,
            FloatRect(100, 100, 150, 150));
+
+  RefPtr<ClipPaintPropertyNode> clip2 = ClipPaintPropertyNode::create(
+      nullptr, nullptr, FloatRoundedRect(1, 1, 2, 2));
+
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(second, clipType);
       PaintChunkProperties properties = defaultPaintChunkProperties();
-      properties.clip = ClipPaintPropertyNode::create(
-          nullptr, nullptr, FloatRoundedRect(1, 1, 2, 2));
+      properties.propertyTreeState.setClip(clip2.get());
+
       getPaintController().updateCurrentPaintChunkProperties(&id, properties);
     }
     ClipRecorder clipRecorder(context, second, clipType, IntRect(1, 1, 2, 2));
     drawRect(context, second, backgroundDrawingType,
              FloatRect(100, 100, 200, 200));
   }
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(
       getPaintController().getDisplayItemList(), 4,
@@ skipping 264 matching lines @@
                                    LayoutRect(100, 200, 100, 100));
   FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
   GraphicsContext context(getPaintController());
 
   PaintChunkProperties container1Properties = defaultPaintChunkProperties();
   PaintChunkProperties container2Properties = defaultPaintChunkProperties();
 
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container1, backgroundDrawingType);
-      container1Properties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container1Properties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container1Properties);
     }
     SubsequenceRecorder r(context, container1);
     drawRect(context, container1, backgroundDrawingType,
              FloatRect(100, 100, 100, 100));
     drawRect(context, content1, backgroundDrawingType,
              FloatRect(100, 100, 50, 200));
     drawRect(context, content1, foregroundDrawingType,
              FloatRect(100, 100, 50, 200));
     drawRect(context, container1, foregroundDrawingType,
              FloatRect(100, 100, 100, 100));
   }
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container2, backgroundDrawingType);
-      container2Properties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container2Properties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container2Properties);
     }
     SubsequenceRecorder r(context, container2);
     drawRect(context, container2, backgroundDrawingType,
              FloatRect(100, 200, 100, 100));
     drawRect(context, content2, backgroundDrawingType,
              FloatRect(100, 200, 50, 200));
     drawRect(context, content2, foregroundDrawingType,
              FloatRect(100, 200, 50, 200));
@@ skipping 130 matching lines @@
                                    LayoutRect(100, 200, 100, 100));
   FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
   GraphicsContext context(getPaintController());
 
   PaintChunkProperties container1Properties = defaultPaintChunkProperties();
   PaintChunkProperties container2Properties = defaultPaintChunkProperties();
 
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container1, backgroundDrawingType);
-      container1Properties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container1Properties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container1Properties);
     }
     drawRect(context, container1, backgroundDrawingType,
              FloatRect(100, 100, 100, 100));
     drawRect(context, content1, backgroundDrawingType,
              FloatRect(100, 100, 50, 200));
   }
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container2, backgroundDrawingType);
-      container2Properties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container2Properties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container2Properties);
     }
     drawRect(context, container2, backgroundDrawingType,
              FloatRect(100, 200, 100, 100));
     drawRect(context, content2, backgroundDrawingType,
              FloatRect(100, 200, 50, 200));
   }
   getPaintController().commitNewDisplayItems();
 
@@ skipping 113 matching lines @@
   PaintChunkProperties content1Properties = defaultPaintChunkProperties();
   PaintChunkProperties container1ForegroundProperties =
       defaultPaintChunkProperties();
   PaintChunkProperties container2BackgroundProperties =
       defaultPaintChunkProperties();
   PaintChunkProperties content2Properties = defaultPaintChunkProperties();
 
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container1, backgroundDrawingType);
-      container1BackgroundProperties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container1BackgroundProperties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container1BackgroundProperties);
     }
     SubsequenceRecorder r(context, container1);
     drawRect(context, container1, backgroundDrawingType,
              FloatRect(100, 100, 100, 100));
     {
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         PaintChunk::Id id(content1, backgroundDrawingType);
-        content1Properties.effect =
-            createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.6);
+        content1Properties.propertyTreeState.setEffect(
+            createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.6)
+                .get());
         getPaintController().updateCurrentPaintChunkProperties(
             &id, content1Properties);
       }
       SubsequenceRecorder r(context, content1);
       drawRect(context, content1, backgroundDrawingType,
                FloatRect(100, 100, 50, 200));
       drawRect(context, content1, foregroundDrawingType,
                FloatRect(100, 100, 50, 200));
     }
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container1, foregroundDrawingType);
-      container1ForegroundProperties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5);
+      container1ForegroundProperties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container1ForegroundProperties);
     }
     drawRect(context, container1, foregroundDrawingType,
              FloatRect(100, 100, 100, 100));
   }
   {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       PaintChunk::Id id(container2, backgroundDrawingType);
-      container2BackgroundProperties.effect =
-          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.7);
+      container2BackgroundProperties.propertyTreeState.setEffect(
+          createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.7).get());
       getPaintController().updateCurrentPaintChunkProperties(
           &id, container2BackgroundProperties);
     }
     SubsequenceRecorder r(context, container2);
     drawRect(context, container2, backgroundDrawingType,
              FloatRect(100, 200, 100, 100));
     {
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         PaintChunk::Id id(content2, backgroundDrawingType);
-        content2Properties.effect =
-            createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.8);
+        content2Properties.propertyTreeState.setEffect(
+            createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.8)
+                .get());
         getPaintController().updateCurrentPaintChunkProperties(
             &id, content2Properties);
       }
       SubsequenceRecorder r(context, content2);
       drawRect(context, content2, backgroundDrawingType,
                FloatRect(100, 200, 50, 200));
     }
   }
   getPaintController().commitNewDisplayItems();
 
@@ skipping 884 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest,
        FoldCompositingDrawingInSubsequence) {
   testFoldCompositingDrawingInSubsequence();
 }
 
 #endif  // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 }  // namespace blink