Blink-side contiguous allocation of display items.

Source/platform/graphics/paint/DisplayItemListTest.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 "config.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 39 matching lines @@
 
     DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
     String debugName() const { return m_name; }
 
 private:
     String m_name;
 };
 
 class TestDisplayItem : public DisplayItem {
 public:
-    TestDisplayItem(const DisplayItemClientWrapper& client, Type type) : DisplayItem(client, type) { }
+    TestDisplayItem(const TestDisplayItemClient& client, Type type) : DisplayItem(client, type) { }
 
     virtual void replay(GraphicsContext&) override final { ASSERT_NOT_REACHED(); }
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override final { ASSERT_NOT_REACHED(); }
 };
 
 #ifndef NDEBUG
 #define TRACE_DISPLAY_ITEMS(i, expected, actual) \
     String trace = String::format("%d: ", (int)i) + "Expected: " + (expected).asDebugString() + " Actual: " + (actual).asDebugString(); \
     SCOPED_TRACE(trace.utf8().data());
 #else
 #define TRACE_DISPLAY_ITEMS(i, expected, actual)
 #endif
 
 #define EXPECT_DISPLAY_LIST(actual, expectedSize, ...) \
     do { \
         EXPECT_EQ((size_t)expectedSize, actual.size()); \
         if (expectedSize != actual.size()) \
             break; \
         const TestDisplayItem expected[] = { __VA_ARGS__ }; \
         for (size_t index = 0; index < std::min<size_t>(actual.size(), expectedSize); index++) { \
-            TRACE_DISPLAY_ITEMS(index, expected[index], actual[index]); \
-            EXPECT_EQ(expected[index].client(), actual[index].client()); \
-            EXPECT_EQ(expected[index].type(), actual[index].type()); \
+            TRACE_DISPLAY_ITEMS(index, expected[index], *actual.elementAt(index)); \
+            EXPECT_EQ(expected[index].client(), actual.elementAt(index)->client()); \
+            EXPECT_EQ(expected[index].type(), actual.elementAt(index)->type()); \
         } \
     } while (false);
 
 void drawRect(GraphicsContext& context, const TestDisplayItemClient& client, DisplayItem::Type type, const FloatRect& bound)
 {
     DrawingRecorder drawingRecorder(context, client, type, bound);
     if (drawingRecorder.canUseCachedDrawing())
         return;
     IntRect rect(0, 0, 10, 10);
     context.drawRect(rect);
@@ skipping 270 matching lines @@
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
     EXPECT_TRUE(displayItemList().clientCacheIsValid(first.displayItemClient()));
     EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
-    const SkPicture* firstPicture = displayItemList().displayItems()[0].picture();
-    const SkPicture* secondPicture = displayItemList().displayItems()[1].picture();
+    const SkPicture* firstPicture = static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(0))->picture();
+    const SkPicture* secondPicture = static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(1))->picture();
 
     displayItemList().invalidate(first.displayItemClient());
     EXPECT_FALSE(displayItemList().clientCacheIsValid(first.displayItemClient()));
     EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
     // The first display item should be updated.
-    EXPECT_NE(firstPicture, displayItemList().displayItems()[0].picture());
+    EXPECT_NE(firstPicture, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(0))->picture());
     // The second display item should be cached.
-    EXPECT_EQ(secondPicture, displayItemList().displayItems()[1].picture());
+    EXPECT_EQ(secondPicture, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(1))->picture());
     EXPECT_TRUE(displayItemList().clientCacheIsValid(first.displayItemClient()));
     EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
 
     displayItemList().invalidateAll();
     EXPECT_FALSE(displayItemList().clientCacheIsValid(first.displayItemClient()));
     EXPECT_FALSE(displayItemList().clientCacheIsValid(second.displayItemClient()));
 }
 
 TEST_F(DisplayItemListTest, ComplexUpdateSwapOrder)
 {
@@ skipping 144 matching lines @@
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(container1, DisplayItem::paintPhaseToEndSubtreeType(backgroundDrawingType)),
 
         TestDisplayItem(container1, DisplayItem::paintPhaseToBeginSubtreeType(foregroundDrawingType)),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType),
         TestDisplayItem(container1, DisplayItem::paintPhaseToEndSubtreeType(foregroundDrawingType)));
 }
 #endif
 
-static bool isDrawing(const DisplayItems::ItemHandle& item)
+static bool isDrawing(const DisplayItem& item)
 {
     return DisplayItem::isDrawingType(item.type());
 }
 
-static bool isCached(const DisplayItems::ItemHandle& item)
+static bool isCached(const DisplayItem& item)
 {
     return DisplayItem::isCachedType(item.type());
 }
 
 TEST_F(DisplayItemListTest, Scope)
 {
     TestDisplayItemClient multicol("multicol");
     TestDisplayItemClient content("content");
     GraphicsContext context(&displayItemList());
 
     FloatRect rect1(100, 100, 50, 50);
     FloatRect rect2(150, 100, 50, 50);
     FloatRect rect3(200, 100, 50, 50);
 
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect1);
     displayItemList().endScope(multicol.displayItemClient());
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect2);
     displayItemList().endScope(multicol.displayItemClient());
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    RefPtr<const SkPicture> picture1 = displayItemList().displayItems()[1].picture();
-    RefPtr<const SkPicture> picture2 = displayItemList().displayItems()[2].picture();
+    RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(1))->picture();
+    RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(2))->picture();
     EXPECT_NE(picture1, picture2);
 
     // Draw again with nothing invalidated.
     EXPECT_TRUE(displayItemList().clientCacheIsValid(multicol.displayItemClient()));
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect1);
     displayItemList().endScope(multicol.displayItemClient());
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect2);
     displayItemList().endScope(multicol.displayItemClient());
 
-    EXPECT_TRUE(isCached(newPaintListBeforeUpdate()[0]));
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[1]));
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[2]));
+    EXPECT_TRUE(isCached(*newPaintListBeforeUpdate().elementAt(0)));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(1)));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(2)));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture1, displayItemList().displayItems()[1].picture());
-    EXPECT_NE(picture2, displayItemList().displayItems()[2].picture());
+    EXPECT_NE(picture1, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(1))->picture());
+    EXPECT_NE(picture2, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(2))->picture());
 
     // Now the multicol becomes 3 columns and repaints.
     displayItemList().invalidate(multicol.displayItemClient());
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect1);
     displayItemList().endScope(multicol.displayItemClient());
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect2);
     displayItemList().endScope(multicol.displayItemClient());
 
     displayItemList().beginScope(multicol.displayItemClient());
     drawRect(context, content, foregroundDrawingType, rect3);
     displayItemList().endScope(multicol.displayItemClient());
 
     // We should repaint everything on invalidation of the scope container.
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[0]));
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[1]));
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[2]));
-    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[3]));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(0)));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(1)));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(2)));
+    EXPECT_TRUE(isDrawing(*newPaintListBeforeUpdate().elementAt(3)));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture1, displayItemList().displayItems()[1].picture());
-    EXPECT_NE(picture2, displayItemList().displayItems()[2].picture());
+    EXPECT_NE(picture1, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(1))->picture());
+    EXPECT_NE(picture2, static_cast<const DrawingDisplayItem*>(displayItemList().displayItems().elementAt(2))->picture());
 }
 
 TEST_F(DisplayItemListTest, OptimizeNoopPairs)
 {
     TestDisplayItemClient first("first");
     TestDisplayItemClient second("second");
     TestDisplayItemClient third("third");
 
     GraphicsContext context(&displayItemList());
     drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
@@ skipping 37 matching lines @@
     drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
     displayItemList().commitNewDisplayItems();
 
     // Empty clips should have been optimized out.
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(third, backgroundDrawingType));
 }
 
 } // namespace blink