Move use of DisplayItemList's vector behind an explicit DisplayItems interface.

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/ClipRecorder.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class DisplayItemListTest : public ::testing::Test {
 protected:
     DisplayItemList& displayItemList() { return m_displayItemList; }
-    const Vector<OwnPtr<DisplayItem>>& newPaintListBeforeUpdate() { return displayItemList().m_newDisplayItems; }
+    const DisplayItems& newPaintListBeforeUpdate() { return displayItemList().m_newDisplayItems; }
 
 private:
     virtual void SetUp() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(true);
     }
     virtual void TearDown() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(false);
     }
@@ skipping 34 matching lines @@
 #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[index]); \
+            EXPECT_EQ(expected[index].client(), actual[index].client()); \
+            EXPECT_EQ(expected[index].type(), actual[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()));
-    DisplayItem* firstDisplayItem = displayItemList().displayItems()[0].get();
-    DisplayItem* secondDisplayItem = displayItemList().displayItems()[1].get();
+    const SkPicture* firstPicture = displayItemList().displayItems()[0].picture();
+    const SkPicture* secondPicture = displayItemList().displayItems()[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(firstDisplayItem, displayItemList().displayItems()[0].get());
+    EXPECT_NE(firstPicture, displayItemList().displayItems()[0].picture());
     // The second display item should be cached.
-    EXPECT_EQ(secondDisplayItem, displayItemList().displayItems()[1].get());
+    EXPECT_EQ(secondPicture, displayItemList().displayItems()[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)
+{
+    return DisplayItem::isDrawingType(item.type());
+}
+
+static bool isCached(const DisplayItems::ItemHandle& 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 = static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[1].get())->picture();
-    RefPtr<const SkPicture> picture2 = static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[2].get())->picture();
+    RefPtr<const SkPicture> picture1 = displayItemList().displayItems()[1].picture();
+    RefPtr<const SkPicture> picture2 = displayItemList().displayItems()[2].picture();
     EXPECT_NE(picture1, picture2);
 
     // Draw again with nothing invalidated.
     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());
 
-    EXPECT_TRUE(newPaintListBeforeUpdate()[0]->isCached());
-    EXPECT_TRUE(newPaintListBeforeUpdate()[1]->isCached());
-    EXPECT_TRUE(newPaintListBeforeUpdate()[2]->isCached());
+    EXPECT_TRUE(isCached(newPaintListBeforeUpdate()[0]));
+    EXPECT_TRUE(isCached(newPaintListBeforeUpdate()[1]));
+    EXPECT_TRUE(isCached(newPaintListBeforeUpdate()[2]));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_EQ(picture1, static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[1].get())->picture());
-    EXPECT_EQ(picture2, static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[2].get())->picture());
+    EXPECT_EQ(picture1, displayItemList().displayItems()[1].picture());
+    EXPECT_EQ(picture2, displayItemList().displayItems()[2].picture());
 
     // Now the multicol becomes 3 columns and repaints.
     displayItemList().invalidate(multicol.displayItemClient());
     displayItemList().invalidate(content.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(newPaintListBeforeUpdate()[0]->isDrawing());
-    EXPECT_TRUE(newPaintListBeforeUpdate()[1]->isDrawing());
-    EXPECT_TRUE(newPaintListBeforeUpdate()[2]->isDrawing());
-    EXPECT_TRUE(newPaintListBeforeUpdate()[3]->isDrawing());
+    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[0]));
+    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[1]));
+    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[2]));
+    EXPECT_TRUE(isDrawing(newPaintListBeforeUpdate()[3]));
     displayItemList().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
-    EXPECT_NE(picture1, static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[1].get())->picture());
-    EXPECT_NE(picture2, static_cast<DrawingDisplayItem*>(displayItemList().displayItems()[2].get())->picture());
+    EXPECT_NE(picture1, displayItemList().displayItems()[1].picture());
+    EXPECT_NE(picture2, displayItemList().displayItems()[2].picture());
 }
 
 } // namespace blink