New display item caching

Source/core/paint/ViewDisplayListTest.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/LayerClipRecorder.h"
 #include "core/paint/LayerPainter.h"
 #include "core/paint/RenderDrawingRecorder.h"
 #include "core/rendering/RenderView.h"
@@ skipping 23 matching lines @@
         RenderingTest::SetUp();
         enableCompositing();
 
         m_renderView = document().view()->renderView();
         ASSERT_TRUE(m_renderView);
     }
 
     virtual void TearDown() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(false);
-        RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(false);
     }
 
     RenderView* m_renderView;
 };
 
 class TestDisplayItem : public DisplayItem {
 public:
     TestDisplayItem(const RenderObject* renderer, Type type) : DisplayItem(renderer->displayItemClient(), type) { }
 
     virtual void replay(GraphicsContext*) override final { ASSERT_NOT_REACHED(); }
@@ skipping 384 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 4,
         TestDisplayItem(firstRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::ClipLayerForeground),
         TestDisplayItem(secondRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::EndClip));
 }
 
 TEST_F(ViewDisplayListTest, CachedDisplayItems)
 {
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
-
     setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
     RenderLayerModelObject* firstRenderer = toRenderLayerModelObject(document().body()->firstChild()->renderer());
     RenderLayerModelObject* secondRenderer = toRenderLayerModelObject(document().body()->firstChild()->firstChild()->renderer());
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     drawRect(&context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
@@ skipping 51 matching lines @@
     document().view()->updateLayoutAndStyleForPainting();
     LayerPainter(*rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(htmlRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(textRenderer, DisplayItem::DrawingPaintPhaseForeground),
         TestDisplayItem(divRenderer, DisplayItem::DrawingPaintPhaseCaret));
 }
 
+TEST_F(ViewDisplayListTest, ComplexUpdateSwapOrder)
+{
+    setBodyInnerHTML("<div id='container1'><div id='content1'></div></div>"
+        "<div id='container2'><div id='content2'></div></div>");
+    RenderObject* container1 = document().body()->firstChild()->renderer();
+    RenderObject* content1 = document().body()->firstChild()->firstChild()->renderer();
+    RenderObject* container2 = document().body()->firstChild()->nextSibling()->renderer();
+    RenderObject* content2 = document().body()->firstChild()->nextSibling()->firstChild()->renderer();
+    GraphicsContext context(nullptr, &rootDisplayItemList());
+
+    drawRect(&context, container1, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
+    drawRect(&context, content1, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
+    drawRect(&context, content1, PaintPhaseForeground, FloatRect(100, 100, 50, 200));
+    drawRect(&context, container1, PaintPhaseForeground, FloatRect(100, 100, 100, 100));
+    drawRect(&context, container2, PaintPhaseBlockBackground, FloatRect(100, 200, 100, 100));
+    drawRect(&context, content2, PaintPhaseBlockBackground, FloatRect(100, 200, 50, 200));
+    drawRect(&context, content2, PaintPhaseForeground, FloatRect(100, 200, 50, 200));
+    drawRect(&context, container2, PaintPhaseForeground, FloatRect(100, 200, 100, 100));
+    rootDisplayItemList().endNewPaints();
+
+    EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 8,
+        TestDisplayItem(container1, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content1, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content1, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container1, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container2, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content2, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content2, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container2, DisplayItem::DrawingPaintPhaseForeground));
+
+    rootDisplayItemList().invalidate(container1->displayItemClient());

[chrishtr, 2015/01/22 22:17:21]

Add a comment that this is simulating the situation when container1 gets e.g. a
z-index that is now greater than container2.

[Xianzhu, 2015/01/22 23:50:59]

Done.

+    drawRect(&context, container2, PaintPhaseBlockBackground, FloatRect(100, 200, 100, 100));
+    drawRect(&context, content2, PaintPhaseBlockBackground, FloatRect(100, 200, 50, 200));
+    drawRect(&context, content2, PaintPhaseForeground, FloatRect(100, 200, 50, 200));
+    drawRect(&context, container2, PaintPhaseForeground, FloatRect(100, 200, 100, 100));
+    drawRect(&context, container1, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
+    drawRect(&context, content1, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
+    drawRect(&context, content1, PaintPhaseForeground, FloatRect(100, 100, 50, 200));
+    drawRect(&context, container1, PaintPhaseForeground, FloatRect(100, 100, 100, 100));
+    rootDisplayItemList().endNewPaints();
+
+    EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 8,
+        TestDisplayItem(container2, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content2, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content2, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container2, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container1, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content1, DisplayItem::DrawingPaintPhaseBlockBackground),
+        TestDisplayItem(content1, DisplayItem::DrawingPaintPhaseForeground),
+        TestDisplayItem(container1, DisplayItem::DrawingPaintPhaseForeground));
+}
+
 } // anonymous namespace
 } // namespace blink