Implement the framework for the paint property hierarchy

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

Index: third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
index 38be4a4e2c804612d0a7c9e67f5c6d0b1b98715b..9b4ddf604ed85a2d0673cf36e13ea8a0b0caf926 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunkerTest.cpp
@@ -14,7 +14,7 @@ using testing::ElementsAre;
 namespace blink {
 namespace {
 
-static PaintProperties samplePaintProperties() { return PaintProperties(); }
+static PaintProperties rootPaintProperties() { return PaintProperties(); }
 
 class PaintChunkerTest : public testing::Test {
 protected:
@@ -41,33 +41,33 @@ TEST_F(PaintChunkerTest, Empty)
 TEST_F(PaintChunkerTest, SingleNonEmptyRange)
 {
     PaintChunker chunker;
-    chunker.updateCurrentPaintProperties(samplePaintProperties());
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
     chunker.incrementDisplayItemIndex();
     chunker.incrementDisplayItemIndex();
     Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
     EXPECT_THAT(chunks, ElementsAre(
-        PaintChunk(0, 2, samplePaintProperties())));
+        PaintChunk(0, 2, rootPaintProperties())));
 }
 
 TEST_F(PaintChunkerTest, SamePropertiesTwiceCombineIntoOneChunk)
 {
     PaintChunker chunker;
-    chunker.updateCurrentPaintProperties(samplePaintProperties());
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
     chunker.incrementDisplayItemIndex();
     chunker.incrementDisplayItemIndex();
-    chunker.updateCurrentPaintProperties(samplePaintProperties());
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
     chunker.incrementDisplayItemIndex();
     Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
     EXPECT_THAT(chunks, ElementsAre(
-        PaintChunk(0, 3, samplePaintProperties())));
+        PaintChunk(0, 3, rootPaintProperties())));
 }
 
 TEST_F(PaintChunkerTest, CanRewindDisplayItemIndex)
 {
     PaintChunker chunker;
-    chunker.updateCurrentPaintProperties(samplePaintProperties());
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
     chunker.incrementDisplayItemIndex();
     chunker.incrementDisplayItemIndex();
     chunker.decrementDisplayItemIndex();
@@ -75,11 +75,61 @@ TEST_F(PaintChunkerTest, CanRewindDisplayItemIndex)
     Vector<PaintChunk> chunks = chunker.releasePaintChunks();
 
     EXPECT_THAT(chunks, ElementsAre(
-        PaintChunk(0, 2, samplePaintProperties())));
+        PaintChunk(0, 2, rootPaintProperties())));
 }
 
-// TODO(jbroman): Add more tests one it is possible for there to be two distinct
-// PaintProperties.
+TEST_F(PaintChunkerTest, BuildMultipleChunksWithSinglePropertyChanging)
+{
+    PaintChunker chunker;
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
+    chunker.incrementDisplayItemIndex();
+    chunker.incrementDisplayItemIndex();
+
+    PaintProperties simpleTransform;
+    simpleTransform.transform = adoptRef(new TransformPaintProperty(TransformPaintProperty::Type::Transform, TransformationMatrix(), FloatPoint3D()));

[jbroman, 2015/10/07 15:22:22]

nit: ::Type is unnecessary; enumerators exist in their enclosing namespace/class

+    chunker.updateCurrentPaintProperties(simpleTransform);
+    chunker.incrementDisplayItemIndex();
+
+    PaintProperties anotherTransform;
+    anotherTransform.transform = adoptRef(new TransformPaintProperty(TransformPaintProperty::Type::Transform, TransformationMatrix(), FloatPoint3D()));
+    chunker.updateCurrentPaintProperties(anotherTransform);
+    chunker.incrementDisplayItemIndex();
+
+    Vector<PaintChunk> chunks = chunker.releasePaintChunks();
+
+    EXPECT_THAT(chunks, ElementsAre(
+        PaintChunk(0, 2, rootPaintProperties()),
+        PaintChunk(2, 3, simpleTransform),
+        PaintChunk(3, 4, anotherTransform)));
+}
+
+TEST_F(PaintChunkerTest, BuildLinearChunksFromNestedTransforms)
+{
+    // 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.updateCurrentPaintProperties(rootPaintProperties());
+    chunker.incrementDisplayItemIndex();
+
+    PaintProperties simpleTransform;
+    simpleTransform.transform = adoptRef(new TransformPaintProperty(TransformPaintProperty::Type::Transform, TransformationMatrix(), FloatPoint3D()));
+    chunker.updateCurrentPaintProperties(simpleTransform);
+    chunker.incrementDisplayItemIndex();
+    chunker.incrementDisplayItemIndex();
+
+    chunker.updateCurrentPaintProperties(rootPaintProperties());
+    chunker.incrementDisplayItemIndex();
+
+    Vector<PaintChunk> chunks = chunker.releasePaintChunks();
+
+    EXPECT_THAT(chunks, ElementsAre(
+        PaintChunk(0, 1, rootPaintProperties()),
+        PaintChunk(1, 3, simpleTransform),
+        PaintChunk(3, 4, rootPaintProperties())));
+}
+
+// TODO(pdr): Add more tests once we have more paint properties.

[jbroman, 2015/10/07 15:22:22]

I'd also like tests for the case that trchen mentioned, where two ranges with
the same paint properties are interrupted by a range with different properties
but no items. i.e.

updateCurrentPaintProperties(a);
incrementDisplayItemIndex();
updateCurrentPaintProperties(b);
updateCurrentPaintProperties(a);
incrementDisplayItemIndex();
EXPECT_THAT(there is one chunk with 2 items and properties a);

I'd have added it before, but I couldn't create unequal properties.

[pdr., 2015/10/07 20:19:11]

Done

 
 } // namespace
 } // namespace blink