SPv2: Add support for tracking raster paint invalidations in testing.

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 140 matching lines @@
     drawClippedRect(context, client, clipType, backgroundDrawingType, FloatRect(100, 100, 200, 200));
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(client, clipType),
         TestDisplayItem(client, backgroundDrawingType),
         TestDisplayItem(client, DisplayItem::clipTypeToEndClipType(clipType)));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
     }
 }
 
 TEST_P(PaintControllerTest, UpdateBasic)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 300, 300));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 200, 200));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 200, 200));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
 
     EXPECT_EQ(0, numCachedNewItems());
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
 
     EXPECT_EQ(2, numCachedNewItems());
 #ifndef NDEBUG
     EXPECT_EQ(2, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(1, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 200, 200))); // |second| disappeared from the chunk.
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 200, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
     }
 }
 
 TEST_P(PaintControllerTest, UpdateSwapOrder)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient unaffected("unaffected", LayoutRect(300, 300, 10, 10));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
@@ skipping 36 matching lines @@
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType),
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType),
         TestDisplayItem(unaffected, backgroundDrawingType),
         TestDisplayItem(unaffected, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 50, 200))); // Bounds of |second|.
+
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Bounds of |second|.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateSwapOrderWithInvalidation)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient unaffected("unaffected", LayoutRect(300, 300, 10, 10));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
@@ skipping 38 matching lines @@
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType),
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType),
         TestDisplayItem(unaffected, backgroundDrawingType),
         TestDisplayItem(unaffected, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 100, 100), // Old bounds of |first|.
-            FloatRect(100, 100, 100, 100))); // New bounds of |first|.
+        EXPECT_EQ(2u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |first|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // New bounds of |first|.
         // No need to invalidate raster of |second| because the client (|first|) which swapped order
         // with it has been invalidated.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateNewItemInMiddle)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient third("third", LayoutRect(125, 100, 200, 50));
@@ skipping 25 matching lines @@
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(third, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(125, 100, 200, 50))); // |third| newly appeared in the chunk.
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(125, 100, 200, 50), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
     }
 }
 
 TEST_P(PaintControllerTest, UpdateInvalidationWithPhases)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient third("third", LayoutRect(300, 100, 50, 50));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
@@ skipping 38 matching lines @@
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(third, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType),
         TestDisplayItem(third, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 50, 200), // Old bounds of |second|.
-            FloatRect(100, 100, 50, 200))); // New bounds of |second|.
+        EXPECT_EQ(2u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |second|.
+        EXPECT_EQ(IntRect(100, 100, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // New bounds of |second|.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateAddFirstOverlap)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 150, 150));
     FakeDisplayItemClient second("second", LayoutRect(200, 200, 50, 50));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
@@ skipping 20 matching lines @@
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 4,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 150, 150), // |first| newly appeared in the chunk.
-            FloatRect(200, 200, 50, 50), // Old bounds of |second|.
-            FloatRect(150, 150, 100, 100))); // New bounds of |second|.
+        EXPECT_EQ(3u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(200, 200, 50, 50), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |second|.
+        EXPECT_EQ(IntRect(100, 100, 150, 150), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // |first| newly appeared in the chunk.
+        EXPECT_EQ(IntRect(150, 150, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[2].rect); // New bounds of |second|.
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     drawRect(context, second, backgroundDrawingType, FloatRect(150, 150, 100, 100));
     drawRect(context, second, foregroundDrawingType, FloatRect(150, 150, 100, 100));
 
     EXPECT_EQ(2, numCachedNewItems());
 #ifndef NDEBUG
     EXPECT_EQ(2, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(2, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 150, 150))); // |first| disappeared from the chunk.
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 150, 150), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // |first| disappeared from the chunk.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateAddLastOverlap)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 150, 150));
     FakeDisplayItemClient second("second", LayoutRect(200, 200, 50, 50));
     GraphicsContext context(getPaintController());
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
@@ skipping 20 matching lines @@
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 4,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 150, 150), // Old bounds of |first|.
-            FloatRect(150, 150, 100, 100), // New bounds of |first|.
-            FloatRect(200, 200, 50, 50))); // |second| newly appeared in the chunk.
+        EXPECT_EQ(3u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 150, 150), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |first|.
+        EXPECT_EQ(IntRect(150, 150, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // New bounds of |first|.
+        EXPECT_EQ(IntRect(200, 200, 50, 50), getPaintController().paintChunks()[0].rasterInvalidationRects[2].rect); // |second| newly appeared in the chunk.
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     first.setDisplayItemsUncached();
     first.setVisualRect(LayoutRect(100, 100, 150, 150));
     second.setDisplayItemsUncached();
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));
     EXPECT_EQ(0, numCachedNewItems());
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(150, 150, 100, 100), // Old bounds of |first|.
-            FloatRect(100, 100, 150, 150), // New bounds of |first|.
-            FloatRect(200, 200, 50, 50))); // |second| disappeared from the chunk.
+
+        EXPECT_EQ(3u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(150, 150, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |first|.
+        EXPECT_EQ(IntRect(200, 200, 50, 50), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // |second| disappeared from the chunk.
+        EXPECT_EQ(IntRect(100, 100, 150, 150), getPaintController().paintChunks()[0].rasterInvalidationRects[2].rect); // New bounds of |first|.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateClip)
 {
     FakeDisplayItemClient first("first", LayoutRect(100, 100, 150, 150));
     FakeDisplayItemClient second("second", LayoutRect(100, 100, 200, 200));
     GraphicsContext context(getPaintController());
 
     {
@@ skipping 30 matching lines @@
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect()))); // This is a new chunk.
 
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // This is a new chunk.
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     second.setDisplayItemsUncached();
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     {
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
             PaintChunk::Id id(second, clipType);
             PaintChunkProperties properties;
             properties.clip = ClipPaintPropertyNode::create(nullptr, nullptr, FloatRoundedRect(1, 1, 2, 2));
             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,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, clipType),
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, DisplayItem::clipTypeToEndClipType(clipType)));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 200, 200))); // |second| disappeared from the first chunk.
-        EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect()))); // This is a new chunk.
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 200, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // |second| disappeared from the first chunk.
+
+        EXPECT_EQ(1u, getPaintController().paintChunks()[1].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[1].rasterInvalidationRects[0].rect); // This is a new chunk.
     }
 }
 
 TEST_P(PaintControllerTest, CachedDisplayItems)
 {
     FakeDisplayItemClient first("first");
     FakeDisplayItemClient second("second");
     GraphicsContext context(getPaintController());
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
@@ skipping 81 matching lines @@
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 200, 100, 100), // Bounds of |container2| which was moved behind |container1|.
-            FloatRect(100, 200, 50, 200))); // Bounds of |content2| which was moved along with |container2|.
+        EXPECT_EQ(2u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 200, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Bounds of |container2| which was moved behind |container1|.
+        EXPECT_EQ(IntRect(100, 200, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // Bounds of |content2| which was moved along with |container2|.
     }
 }
 
 TEST_P(PaintControllerTest, UpdateSwapOrderWithChildrenAndInvalidation)
 {
     FakeDisplayItemClient container1("container1", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient content1("content1", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient container2("container2", LayoutRect(100, 200, 100, 100));
     FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
     GraphicsContext context(getPaintController());
@@ skipping 41 matching lines @@
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 100, 100), // Old bounds of |container1|.
-            FloatRect(100, 100, 100, 100), // New bounds of |container1|.
-            FloatRect(100, 200, 100, 100), // Bounds of |container2| which was moved behind |container1|.
-            FloatRect(100, 200, 50, 200))); // Bounds of |content2| which was moved along with |container2|.
+        EXPECT_EQ(4u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |container1|.
+        EXPECT_EQ(IntRect(100, 200, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // Bounds of |container2| which was moved behind |container1|.
+        EXPECT_EQ(IntRect(100, 200, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[2].rect); // Bounds of |content2| which was moved along with |container2|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[3].rect); // New bounds of |container1|.
     }
 }
 
 TEST_P(PaintControllerTest, CachedSubsequenceSwapOrder)
 {
     FakeDisplayItemClient container1("container1", LayoutRect(100, 100, 100, 100));
     FakeDisplayItemClient content1("content1", LayoutRect(100, 100, 50, 200));
     FakeDisplayItemClient container2("container2", LayoutRect(100, 200, 100, 100));
     FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
     GraphicsContext context(getPaintController());
@@ skipping 39 matching lines @@
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
         TestDisplayItem(container2, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[1].id);
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
+
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |container1|.
+        EXPECT_EQ(1u, getPaintController().paintChunks()[1].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[1].rasterInvalidationRects[0].rect); // Old bounds of |container1|.
     }
 
     // Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.
     if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
         // When under-invalidation-checking is enabled, useCachedSubsequenceIfPossible is forced off,
         // and the client is expected to create the same painting as in the previous paint.
         EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));
         {
             if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
                 PaintChunk::Id id(container2, backgroundDrawingType);
@@ skipping 94 matching lines @@
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 4,
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[1].id);
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
+
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[1].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[1].rasterInvalidationRects[0].rect);
     }
 
     // Move content2 into container1, without invalidation.
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         PaintChunk::Id id(container1, backgroundDrawingType);
         getPaintController().updateCurrentPaintChunkProperties(&id, container1Properties);
     }
     drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
@@ skipping 16 matching lines @@
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(container2, backgroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         // |content2| is invalidated raster on both the old chunk and the new chunk.
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 200, 50, 200)));
-        EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 200, 50, 200)));
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 200, 50, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[1].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 200, 50, 200), getPaintController().paintChunks()[1].rasterInvalidationRects[0].rect);
     }
 }
 
 TEST_P(PaintControllerTest, OutOfOrderNoCrash)
 {
     FakeDisplayItemClient client("client");
     GraphicsContext context(getPaintController());
 
     const DisplayItem::Type type1 = DisplayItem::kDrawingFirst;
     const DisplayItem::Type type2 = static_cast<DisplayItem::Type>(DisplayItem::kDrawingFirst + 1);
@@ skipping 91 matching lines @@
         TestDisplayItem(content2, DisplayItem::kEndSubsequence),
         TestDisplayItem(container2, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(5u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(content1, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         EXPECT_EQ(PaintChunk::Id(container1, foregroundDrawingType), getPaintController().paintChunks()[2].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[3].id);
         EXPECT_EQ(PaintChunk::Id(content2, backgroundDrawingType), getPaintController().paintChunks()[4].id);
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[2].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[3].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
-        EXPECT_THAT(getPaintController().paintChunks()[4].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
+
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[1].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[2].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[3].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+        EXPECT_EQ(1u, getPaintController().paintChunks()[4].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
     }
 
     // Invalidate container1 but not content1.
     container1.setDisplayItemsUncached();
 
     // Container2 itself now becomes empty (but still has the 'content2' child),
     // and chooses not to output subsequence info.
 
     container2.setDisplayItemsUncached();
     content2.setDisplayItemsUncached();
@@ skipping 54 matching lines @@
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(content1, DisplayItem::kEndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
         TestDisplayItem(container1, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(3u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(content2, foregroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(content1, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         EXPECT_EQ(PaintChunk::Id(container1, foregroundDrawingType), getPaintController().paintChunks()[2].id);
+
         // This is a new chunk.
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(LayoutRect::infiniteIntRect())));
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
+
         // This chunk didn't change.
         EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre());
         // |container1| is invalidated.
-        EXPECT_THAT(getPaintController().paintChunks()[2].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 100, 100), // Old bounds of |container1|.
-            FloatRect(100, 100, 100, 100))); // New bounds of |container1|.
+        EXPECT_EQ(2u, getPaintController().paintChunks()[2].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[2].rasterInvalidationRects[0].rect); // Old bounds of |container1|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[2].rasterInvalidationRects[1].rect); // New bounds of |container1|.
     }
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
     DisplayItemClient::endShouldKeepAliveAllClients();
 #endif
 }
 
 TEST_P(PaintControllerTest, SkipCache)
 {
     FakeDisplayItemClient multicol("multicol", LayoutRect(100, 100, 200, 200));
@@ skipping 18 matching lines @@
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     sk_sp<const SkPicture> picture1 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
     sk_sp<const SkPicture> picture2 = sk_ref_sp(static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
     EXPECT_NE(picture1, picture2);
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
+        EXPECT_EQ(1u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(LayoutRect::infiniteIntRect(), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect);
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     // Draw again with nothing invalidated.
     EXPECT_TRUE(getPaintController().clientCacheIsValid(multicol));
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
 
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
@@ skipping 11 matching lines @@
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     EXPECT_NE(picture1.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
     EXPECT_NE(picture2.get(), static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[2]).picture());
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 100, 100), // Old bounds of |content|.
-            FloatRect(100, 100, 100, 100))); // New bounds of |content|.
+        EXPECT_EQ(2u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |content|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // New bounds of |content|.
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     // Now the multicol becomes 3 columns and repaints.
     multicol.setDisplayItemsUncached();
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));
 
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
     drawRect(context, content, foregroundDrawingType, rect2);
     drawRect(context, content, foregroundDrawingType, rect3);
     getPaintController().endSkippingCache();
 
     // We should repaint everything on invalidation of the scope container.
     EXPECT_DISPLAY_LIST(getPaintController().newDisplayItemList(), 4,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     EXPECT_NE(picture1.get(), static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[1]).picture());
     EXPECT_NE(picture2.get(), static_cast<const DrawingDisplayItem&>(getPaintController().newDisplayItemList()[2]).picture());
 
     getPaintController().commitNewDisplayItems();
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(1u, getPaintController().paintChunks().size());
-        EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
-            FloatRect(100, 100, 200, 200), // Old bounds of |multicol|.
-            FloatRect(100, 100, 200, 200), // New bounds of |multicol|.
-            FloatRect(100, 100, 100, 100), // Old bounds of |content|.
-            FloatRect(100, 100, 100, 100))); // New bounds of |content|.
+        EXPECT_EQ(4u, getPaintController().paintChunks()[0].rasterInvalidationRects.size());
+        EXPECT_EQ(IntRect(100, 100, 200, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[0].rect); // Old bounds of |multicol|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[1].rect); // Old bounds of |content|.
+        EXPECT_EQ(IntRect(100, 100, 200, 200), getPaintController().paintChunks()[0].rasterInvalidationRects[2].rect); // New bounds of |multicol|.
+        EXPECT_EQ(IntRect(100, 100, 100, 100), getPaintController().paintChunks()[0].rasterInvalidationRects[3].rect); // New bounds of |content|.
     }
 }
 
 TEST_P(PaintControllerTest, PartialSkipCache)
 {
     FakeDisplayItemClient content("content");
     GraphicsContext context(getPaintController());
 
     FloatRect rect1(100, 100, 50, 50);
     FloatRect rect2(150, 100, 50, 50);
@@ skipping 537 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest, FoldCompositingDrawingInSubsequence)
 {
     testFoldCompositingDrawingInSubsequence();
 }
 
 #endif // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 } // namespace blink