Blink-side contiguous allocation of display items.

Source/core/paint/LayoutObjectDrawingRecorderTest.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 "core/paint/LayoutObjectDrawingRecorder.h"
 
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/DeprecatedPaintLayer.h"
@@ skipping 50 matching lines @@
 
 void drawRect(GraphicsContext& context, LayoutView& layoutView, PaintPhase phase, const FloatRect& bound)
 {
     LayoutObjectDrawingRecorder drawingRecorder(context, layoutView, phase, bound);
     if (drawingRecorder.canUseCachedDrawing())
         return;
     IntRect rect(0, 0, 10, 10);
     context.drawRect(rect);
 }
 
-bool isDrawing(const DisplayItems::ItemHandle& item)
+bool isDrawing(const DisplayItem& item)
 {
     return DisplayItem::isDrawingType(item.type());
 }
 
-bool isCached(const DisplayItems::ItemHandle& item)
+bool isCached(const DisplayItem& item)
 {
     return DisplayItem::isCachedType(item.type());
 }
 
 TEST_F(LayoutObjectDrawingRecorderTest, Nothing)
 {
     GraphicsContext context(&rootDisplayItemList());
     FloatRect bound = layoutView().viewRect();
     EXPECT_EQ((size_t)0, rootDisplayItemList().displayItems().size());
 
     drawNothing(context, layoutView(), PaintPhaseForeground, bound);
     rootDisplayItemList().commitNewDisplayItems();
     EXPECT_EQ((size_t)1, rootDisplayItemList().displayItems().size());
-    const auto& item = rootDisplayItemList().displayItems()[0];
+    const auto& item = *rootDisplayItemList().displayItems().elementAt(0);
     ASSERT_TRUE(isDrawing(item));
-    EXPECT_FALSE(item.picture());
+    EXPECT_FALSE(static_cast<const DrawingDisplayItem&>(item).picture());
 }
 
 TEST_F(LayoutObjectDrawingRecorderTest, Rect)
 {
     GraphicsContext context(&rootDisplayItemList());
     FloatRect bound = layoutView().viewRect();
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
     rootDisplayItemList().commitNewDisplayItems();
     EXPECT_EQ((size_t)1, rootDisplayItemList().displayItems().size());
-    EXPECT_TRUE(isDrawing(rootDisplayItemList().displayItems()[0]));
+    EXPECT_TRUE(isDrawing(*rootDisplayItemList().displayItems().elementAt(0)));
 }
 
 TEST_F(LayoutObjectDrawingRecorderTest, Cached)
 {
     GraphicsContext context(&rootDisplayItemList());
     FloatRect bound = layoutView().viewRect();
     drawNothing(context, layoutView(), PaintPhaseBlockBackground, bound);
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
     rootDisplayItemList().commitNewDisplayItems();
     EXPECT_EQ((size_t)2, rootDisplayItemList().displayItems().size());
-    EXPECT_TRUE(isDrawing(rootDisplayItemList().displayItems()[0]));
-    EXPECT_TRUE(isDrawing(rootDisplayItemList().displayItems()[1]));
+    EXPECT_TRUE(isDrawing(*rootDisplayItemList().displayItems().elementAt(0)));
+    EXPECT_TRUE(isDrawing(*rootDisplayItemList().displayItems().elementAt(1)));
 
     drawNothing(context, layoutView(), PaintPhaseBlockBackground, bound);
     drawRect(context, layoutView(), PaintPhaseForeground, bound);
     EXPECT_EQ((size_t)2, newDisplayItemsBeforeUpdate().size());
-    EXPECT_TRUE(isCached(newDisplayItemsBeforeUpdate()[0]));
-    EXPECT_TRUE(isCached(newDisplayItemsBeforeUpdate()[1]));
+    EXPECT_TRUE(isCached(*newDisplayItemsBeforeUpdate().elementAt(0)));
+    EXPECT_TRUE(isCached(*newDisplayItemsBeforeUpdate().elementAt(1)));
     rootDisplayItemList().commitNewDisplayItems();
     EXPECT_EQ((size_t)2, rootDisplayItemList().displayItems().size());
-    EXPECT_TRUE(isDrawing(rootDisplayItemList().displayItems()[0]));
-    EXPECT_TRUE(isDrawing(rootDisplayItemList().displayItems()[1]));
+    EXPECT_TRUE(isDrawing(*rootDisplayItemList().displayItems().elementAt(0)));
+    EXPECT_TRUE(isDrawing(*rootDisplayItemList().displayItems().elementAt(1)));
 }
 
 } // namespace
 } // namespace blink