Find cached display items directly during painting

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h

 // Copyright 2015 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.
 
 #ifndef PaintControllerPaintTest_h
 #define PaintControllerPaintTest_h
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
@@ skipping 57 matching lines @@
 
     bool displayItemListContains(const DisplayItemList& displayItemList, DisplayItemClient& client, DisplayItem::Type type)
     {
         for (auto& item : displayItemList) {
             if (item.client() == client && item.getType() == type)
                 return true;
         }
         return false;
     }
 
+    int numCachedNewItems() { return rootPaintController().m_numCachedNewItems; }
+
 private:
     bool m_originalSlimmingPaintInvalidationEnabled;
     bool m_originalSlimmingPaintV2Enabled;
     bool m_enableSlimmingPaintV2;
 };
 
 class PaintControllerPaintTest : public PaintControllerPaintTestBase {
 public:
     PaintControllerPaintTest() : PaintControllerPaintTestBase(false) { }
 };
@@ skipping 34 matching lines @@
         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].getType(), actual[index].getType()); \
         } \
     } while (false);
 
 // Shorter names for frequently used display item types in tests.
 const DisplayItem::Type backgroundType = DisplayItem::BoxDecorationBackground;
-const DisplayItem::Type cachedBackgroundType = DisplayItem::drawingTypeToCachedDrawingType(backgroundType);
 const DisplayItem::Type foregroundType = DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground);
-const DisplayItem::Type cachedForegroundType = DisplayItem::drawingTypeToCachedDrawingType(foregroundType);
 const DisplayItem::Type documentBackgroundType = DisplayItem::DocumentBackground;
-const DisplayItem::Type cachedDocumentBackgroundType = DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::DocumentBackground);
 
 } // namespace blink
 
 #endif // PaintControllerPaintTest_h