Refactor PaintChunkProperties to use PropertyTreeState

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

 // Copyright 2015 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/PaintChunker.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/testing/PaintPropertyTestHelpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 95 matching lines @@
 }
 
 TEST_F(PaintChunkerTest, BuildMultipleChunksWithSinglePropertyChanging) {
   PaintChunker chunker;
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransform = defaultPaintChunkProperties();
-  simpleTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  simpleTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
 
   chunker.updateCurrentPaintChunkProperties(nullptr, simpleTransform);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties anotherTransform = defaultPaintChunkProperties();
-  anotherTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  anotherTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(nullptr, anotherTransform);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
   EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 2, nullptr,
                                              defaultPaintChunkProperties()),
                                   PaintChunk(2, 3, nullptr, simpleTransform),
                                   PaintChunk(3, 4, nullptr, anotherTransform)));
 }
 
 TEST_F(PaintChunkerTest, BuildMultipleChunksWithDifferentPropertyChanges) {
   PaintChunker chunker;
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransform = defaultPaintChunkProperties();
-  simpleTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 0, 0, 0, 0, 0), FloatPoint3D(9, 8, 7));
+  simpleTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 0, 0, 0, 0, 0),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(nullptr, simpleTransform);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransformAndEffect = defaultPaintChunkProperties();
-  simpleTransformAndEffect.transform = simpleTransform.transform;
-  simpleTransformAndEffect.effect =
-      createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5f);
+  simpleTransformAndEffect.propertyTreeState.setTransform(
+      simpleTransform.propertyTreeState.transform());
+  simpleTransformAndEffect.propertyTreeState.setEffect(
+      createOpacityOnlyEffect(EffectPaintPropertyNode::root(), 0.5f).get());
   chunker.updateCurrentPaintChunkProperties(nullptr, simpleTransformAndEffect);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransformAndEffectWithUpdatedTransform =
       defaultPaintChunkProperties();
-  simpleTransformAndEffectWithUpdatedTransform.transform =
+  simpleTransformAndEffectWithUpdatedTransform.propertyTreeState.setTransform(
       TransformPaintPropertyNode::create(nullptr,
                                          TransformationMatrix(1, 1, 0, 0, 0, 0),
-                                         FloatPoint3D(9, 8, 7));
-  simpleTransformAndEffectWithUpdatedTransform.effect =
-      createOpacityOnlyEffect(EffectPaintPropertyNode::root(),
-                              simpleTransformAndEffect.effect->opacity());
+                                         FloatPoint3D(9, 8, 7))
+          .get());
+  simpleTransformAndEffectWithUpdatedTransform.propertyTreeState.setEffect(
+      createOpacityOnlyEffect(
+          EffectPaintPropertyNode::root(),
+          simpleTransformAndEffect.propertyTreeState.effect()->opacity())
+          .get());
   chunker.updateCurrentPaintChunkProperties(
       nullptr, simpleTransformAndEffectWithUpdatedTransform);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   // Test that going back to a previous chunk property still creates a new
   // chunk.
   chunker.updateCurrentPaintChunkProperties(nullptr, simpleTransformAndEffect);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
@@ skipping 14 matching lines @@
   // Test that "nested" transforms linearize using the following
   // sequence of transforms and display items:
   // <root xform>, <paint>, <a xform>, <paint>, <paint>, </a xform>, <paint>,
   // </root xform>
   PaintChunker chunker;
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransform = defaultPaintChunkProperties();
-  simpleTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  simpleTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(nullptr, simpleTransform);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
   EXPECT_THAT(
       chunks,
       ElementsAre(PaintChunk(0, 1, nullptr, defaultPaintChunkProperties()),
                   PaintChunk(1, 3, nullptr, simpleTransform),
                   PaintChunk(3, 4, nullptr, defaultPaintChunkProperties())));
 }
 
 TEST_F(PaintChunkerTest, ChangingPropertiesWithoutItems) {
   // Test that properties can change without display items being generated.
   PaintChunker chunker;
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties firstTransform = defaultPaintChunkProperties();
-  firstTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  firstTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(nullptr, firstTransform);
 
   PaintChunkProperties secondTransform = defaultPaintChunkProperties();
-  secondTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(9, 8, 7, 6, 5, 4), FloatPoint3D(3, 2, 1));
+  secondTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(9, 8, 7, 6, 5, 4),
+                                         FloatPoint3D(3, 2, 1))
+          .get());
   chunker.updateCurrentPaintChunkProperties(nullptr, secondTransform);
 
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
   EXPECT_THAT(chunks, ElementsAre(PaintChunk(0, 1, nullptr,
                                              defaultPaintChunkProperties()),
                                   PaintChunk(1, 2, nullptr, secondTransform)));
 }
 
@@ skipping 45 matching lines @@
   DisplayItem::Id id1 = i1.getId();
   TestDisplayItemRequiringSeparateChunk i2(m_client);
   DisplayItem::Id id2 = i2.getId();
 
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransform = defaultPaintChunkProperties();
-  simpleTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  simpleTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(&id1, simpleTransform);
 
   chunker.incrementDisplayItemIndex(i1);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(i2);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
@@ skipping 15 matching lines @@
   DisplayItem::Id id1 = i1.getId();
   TestDisplayItemRequiringSeparateChunk i2(m_client);
   i2.setSkippedCache();
 
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   PaintChunkProperties simpleTransform = defaultPaintChunkProperties();
-  simpleTransform.transform = TransformPaintPropertyNode::create(
-      nullptr, TransformationMatrix(0, 1, 2, 3, 4, 5), FloatPoint3D(9, 8, 7));
+  simpleTransform.propertyTreeState.setTransform(
+      TransformPaintPropertyNode::create(nullptr,
+                                         TransformationMatrix(0, 1, 2, 3, 4, 5),
+                                         FloatPoint3D(9, 8, 7))
+          .get());
   chunker.updateCurrentPaintChunkProperties(&id1, simpleTransform);
 
   chunker.incrementDisplayItemIndex(i1);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
   chunker.incrementDisplayItemIndex(i2);
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   chunker.updateCurrentPaintChunkProperties(nullptr,
                                             defaultPaintChunkProperties());
   chunker.incrementDisplayItemIndex(NormalTestDisplayItem(m_client));
 
   Vector<PaintChunk> chunks = chunker.releasePaintChunks();
   EXPECT_THAT(
       chunks,
       ElementsAre(PaintChunk(0, 2, nullptr, defaultPaintChunkProperties()),
                   PaintChunk(2, 4, nullptr, simpleTransform),
                   PaintChunk(4, 5, nullptr, simpleTransform),
                   PaintChunk(5, 6, nullptr, simpleTransform),
                   PaintChunk(6, 7, nullptr, defaultPaintChunkProperties())));
 }
 
 }  // namespace
 }  // namespace blink