Remove blink::RuntimeEnabledFeatures::slimmingPaintDisplayItemCache

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/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/page/FocusController.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "core/paint/DeprecatedPaintLayerPainter.h"
 #include "core/paint/LayerClipRecorder.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ScopeRecorder.h"
 #include "core/paint/SubtreeRecorder.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class ViewDisplayListTest : public RenderingTest {
 public:
     ViewDisplayListTest()
-        : m_layoutView(nullptr)
-        , m_originalDisplayItemCacheEnabled(false) { }
+        : m_layoutView(nullptr) { }
 
 protected:
     LayoutView* layoutView() { return m_layoutView; }
     DisplayItemList& rootDisplayItemList() { return *layoutView()->layer()->graphicsLayerBacking()->displayItemList(); }
     const Vector<OwnPtr<DisplayItem>>& newPaintListBeforeUpdate() { return rootDisplayItemList().m_newPaints; }
 
 private:
     virtual void SetUp() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(true);
-        m_originalDisplayItemCacheEnabled = RuntimeEnabledFeatures::slimmingPaintDisplayItemCacheEnabled();
 
         RenderingTest::SetUp();
         enableCompositing();
 
         m_layoutView = document().view()->layoutView();
         ASSERT_TRUE(m_layoutView);
     }
 
     virtual void TearDown() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(false);
-        RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(m_originalDisplayItemCacheEnabled);
     }
 
     LayoutView* m_layoutView;
-    bool m_originalDisplayItemCacheEnabled;
 };
 
 class TestDisplayItem : public DisplayItem {
 public:
     TestDisplayItem(const LayoutObject* renderer, Type type) : DisplayItem(renderer->displayItemClient(), type) { }
     TestDisplayItem(DisplayItemClient displayItemClient, Type type) : DisplayItem(displayItemClient, type) { }
 
     virtual void replay(GraphicsContext*) override final { ASSERT_NOT_REACHED(); }
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override final { ASSERT_NOT_REACHED(); }
 };
@@ skipping 306 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 4,
         TestDisplayItem(firstRenderer, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(secondRenderer, DisplayItem::ClipLayerForeground),
         TestDisplayItem(secondRenderer, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(secondRenderer, DisplayItem::clipTypeToEndClipType(DisplayItem::ClipLayerForeground)));
 }
 
 TEST_F(ViewDisplayListTest, CachedDisplayItems)
 {
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
-
     setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
     LayoutBoxModelObject* firstRenderer = toLayoutBoxModelObject(document().body()->firstChild()->layoutObject());
     LayoutBoxModelObject* secondRenderer = toLayoutBoxModelObject(document().body()->firstChild()->firstChild()->layoutObject());
     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 20 matching lines @@
     // The second display item should be cached.
     EXPECT_EQ(secondDisplayItem, rootDisplayItemList().paintList()[1].get());
     EXPECT_TRUE(rootDisplayItemList().clientCacheIsValid(firstRenderer->displayItemClient()));
     EXPECT_TRUE(rootDisplayItemList().clientCacheIsValid(secondRenderer->displayItemClient()));
 
     rootDisplayItemList().invalidateAll();
     EXPECT_FALSE(rootDisplayItemList().clientCacheIsValid(firstRenderer->displayItemClient()));
     EXPECT_FALSE(rootDisplayItemList().clientCacheIsValid(secondRenderer->displayItemClient()));
 }
 
-TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret_CacheDisabled)
+TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret)
 {
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(false);
-
     setBodyInnerHTML("<div id='div' contentEditable='true' style='outline:none'>XYZ</div>");
     document().page()->focusController().setActive(true);
     document().page()->focusController().setFocused(true);
-    LayoutView* layoutView = document().layoutView();
-    DeprecatedPaintLayer* rootLayer = layoutView->layer();
-    LayoutObject* htmlRenderer = document().documentElement()->layoutObject();
-    Element* div = toElement(document().body()->firstChild());
-    LayoutObject* divRenderer = document().body()->firstChild()->layoutObject();
-    InlineTextBox* textInlineBox = toLayoutText(div->firstChild()->layoutObject())->firstTextBox();
-
-    SkCanvas canvas(800, 600);
-    GraphicsContext context(&canvas, &rootDisplayItemList());
-    DeprecatedPaintLayerPaintingInfo paintingInfo(rootLayer, LayoutRect(0, 0, 800, 600), PaintBehaviorNormal, LayoutSize());
-    DeprecatedPaintLayerPainter(*rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
-    rootDisplayItemList().endNewPaints();
-
-    EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
-        TestDisplayItem(htmlRenderer, DisplayItem::BoxDecorationBackground),
-        TestDisplayItem(textInlineBox->displayItemClient(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
-
-    div->focus();
-    document().view()->updateLayoutAndStyleForPainting();
-    DeprecatedPaintLayerPainter(*rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
-    rootDisplayItemList().endNewPaints();
-
-    EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
-        TestDisplayItem(htmlRenderer, DisplayItem::BoxDecorationBackground),
-        TestDisplayItem(textInlineBox->displayItemClient(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
-        TestDisplayItem(divRenderer, DisplayItem::Caret));
-}
-
-TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret_CacheEnabled)
-{
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
-
-    setBodyInnerHTML("<div id='div' contentEditable='true' style='outline:none'>XYZ</div>");
-    document().page()->focusController().setActive(true);
-    document().page()->focusController().setFocused(true);
     LayoutView* layoutView = document().layoutView();
     DeprecatedPaintLayer* rootLayer = layoutView->layer();
     LayoutObject* htmlRenderer = document().documentElement()->layoutObject();
     LayoutObject* bodyRenderer = document().body()->layoutObject();
     Element* div = toElement(document().body()->firstChild());
     LayoutObject* divRenderer = document().body()->firstChild()->layoutObject();
     InlineTextBox* textInlineBox = toLayoutText(div->firstChild()->layoutObject())->firstTextBox();
 
     SkCanvas canvas(800, 600);
     GraphicsContext context(&canvas, &rootDisplayItemList());
@@ skipping 86 matching lines @@
         TestDisplayItem(container2, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(container1, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(content1, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(content1, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(container1, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 }
 
 // Enable this when cached subtree flags are ready.
 TEST_F(ViewDisplayListTest, DISABLED_CachedSubtreeSwapOrder)
 {
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
-
     setBodyInnerHTML("<div id='container1'><div id='content1'></div></div>"
         "<div id='container2'><div id='content2'></div></div>");
     LayoutObject* container1 = document().body()->firstChild()->layoutObject();
     LayoutObject* content1 = document().body()->firstChild()->firstChild()->layoutObject();
     LayoutObject* container2 = document().body()->firstChild()->nextSibling()->layoutObject();
     LayoutObject* content2 = document().body()->firstChild()->nextSibling()->firstChild()->layoutObject();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     {
         SubtreeRecorder r(&context, *container1, PaintPhaseBlockBackground);
@@ skipping 84 matching lines @@
         TestDisplayItem(container1, DisplayItem::paintPhaseToEndSubtreeType(PaintPhaseBlockBackground)),
 
         TestDisplayItem(container1, DisplayItem::paintPhaseToBeginSubtreeType(PaintPhaseForeground)),
         TestDisplayItem(content1, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(container1, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(container1, DisplayItem::paintPhaseToEndSubtreeType(PaintPhaseForeground)));
 }
 
 TEST_F(ViewDisplayListTest, Scope)
 {
-    RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
-
     setBodyInnerHTML("<div id='multicol'><div id='content'></div></div>");
 
     LayoutObject* multicol = document().body()->firstChild()->layoutObject();
     LayoutObject* content = document().body()->firstChild()->firstChild()->layoutObject();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     FloatRect rect1(100, 100, 50, 50);
     FloatRect rect2(150, 100, 50, 50);
     FloatRect rect3(200, 100, 50, 50);
     drawRect(&context, multicol, PaintPhaseBlockBackground, FloatRect(100, 200, 100, 100));
@@ skipping 60 matching lines @@
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 4,
         TestDisplayItem(multicol, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(content, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(content, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(content, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
     EXPECT_NE(picture1, static_cast<DrawingDisplayItem*>(rootDisplayItemList().paintList()[1].get())->picture());
     EXPECT_NE(picture2, static_cast<DrawingDisplayItem*>(rootDisplayItemList().paintList()[2].get())->picture());
 }
 
 } // namespace blink