Remove blink::RuntimeEnabledFeatures::slimmingPaintDisplayItemCache

Source/platform/graphics/paint/DisplayItemList.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/NotImplemented.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
@@ skipping 18 matching lines @@
 {
     ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
 
     if (displayItem->isEnd()) {
         ASSERT(!m_newPaints.isEmpty());
         if (m_newPaints.last()->isBegin() && !m_newPaints.last()->drawsContent()) {
             ASSERT(displayItem->isEndAndPairedWith(*m_newPaints.last()));
             // Remove the beginning display item of this empty pair.
             m_newPaints.removeLast();
 #if ENABLE(ASSERT)
-            if (RuntimeEnabledFeatures::slimmingPaintDisplayItemCacheEnabled()) {
-                // Also remove the index pointing to the removed display item.
-                Vector<size_t>& indices = m_newDisplayItemIndicesByClient.find(displayItem->client())->value;
-                if (!indices.isEmpty() && indices.last() == m_newPaints.size())
-                    indices.removeLast();
-            }
+            // Also remove the index pointing to the removed display item.
+            Vector<size_t>& indices = m_newDisplayItemIndicesByClient.find(displayItem->client())->value;
+            if (!indices.isEmpty() && indices.last() == m_newPaints.size())
+                indices.removeLast();
 #endif
             return;
         }
     }
 
     if (!m_scopeStack.isEmpty())
         displayItem->setScope(m_scopeStack.last().client, m_scopeStack.last().id);
 
 #if ENABLE(ASSERT)
-    if (RuntimeEnabledFeatures::slimmingPaintDisplayItemCacheEnabled()) {
-        // This will check for duplicated display item ids.
-        appendDisplayItem(m_newPaints, m_newDisplayItemIndicesByClient, displayItem);
-        return;
-    }
+    // This will check for duplicated display item ids.
+    appendDisplayItem(m_newPaints, m_newDisplayItemIndicesByClient, displayItem);
+#else
+    m_newPaints.append(displayItem);
 #endif
-    m_newPaints.append(displayItem);
 }
 
 void DisplayItemList::beginScope(DisplayItemClient client)
 {
     ClientScopeIdMap::iterator it = m_clientScopeIdMap.find(client);
     int scopeId;
     if (it == m_clientScopeIdMap.end()) {
         m_clientScopeIdMap.add(client, 0);
         scopeId = 0;
     } else {
@@ skipping 21 matching lines @@
 {
     ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
     // Can only be called during layout/paintInvalidation, not during painting.
     ASSERT(m_newPaints.isEmpty());
     m_paintList.clear();
     m_cachedDisplayItemIndicesByClient.clear();
 }
 
 bool DisplayItemList::clientCacheIsValid(DisplayItemClient client) const
 {
-    return RuntimeEnabledFeatures::slimmingPaintDisplayItemCacheEnabled()
-        && m_cachedDisplayItemIndicesByClient.contains(client)
+    return m_cachedDisplayItemIndicesByClient.contains(client)
         // If the scope is invalid, the client is treated invalid even if it's not invalidated explicitly.
         && (m_scopeStack.isEmpty() || m_scopeStack.last().cacheIsValid);
 }
 
 size_t DisplayItemList::findMatchingItem(const DisplayItem& displayItem, DisplayItem::Type matchingType, const DisplayItemIndicesByClientMap& displayItemIndicesByClient, const PaintList& list)
 {
     DisplayItemIndicesByClientMap::const_iterator it = displayItemIndicesByClient.find(displayItem.client());
     if (it == displayItemIndicesByClient.end())
         return kNotFound;
 
@@ skipping 66 matching lines @@
 void DisplayItemList::updatePaintList()
 {
     // These data structures are used during painting only.
 #if ENABLE(ASSERT)
     m_newDisplayItemIndicesByClient.clear();
 #endif
     m_clientScopeIdMap.clear();
     ASSERT(m_scopeStack.isEmpty());
     m_scopeStack.clear();
 
-    if (!RuntimeEnabledFeatures::slimmingPaintDisplayItemCacheEnabled()) {
-        m_paintList.clear();
-        m_paintList.swap(m_newPaints);
-        m_cachedDisplayItemIndicesByClient.clear();
-        return;
-    }
-
     PaintList updatedList;
     DisplayItemIndicesByClientMap newCachedDisplayItemIndicesByClient;
 
     for (OwnPtr<DisplayItem>& newDisplayItem : m_newPaints) {
         if (newDisplayItem->isCached() || newDisplayItem->isSubtreeCached()) {
             copyCachedItems(*newDisplayItem, updatedList, newCachedDisplayItemIndicesByClient);
         } else {
             if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled())
                 checkCachedDisplayItemIsUnchangedFromPreviousPaintList(*newDisplayItem);
             // FIXME: Enable this assert after we resolve the scope invalidation issue.
@@ skipping 101 matching lines @@
 #endif // ifndef NDEBUG
 
 void DisplayItemList::replay(GraphicsContext* context)
 {
     updatePaintList();
     for (auto& displayItem : m_paintList)
         displayItem->replay(context);
 }
 
 } // namespace blink