Find cached display items directly during painting

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

Index: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h
diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h
index 83a1cf404b1b81b9adcd1a1aff6a324b8e0ed66b..db2c9b1894595f69bce2541669222a9cd0bd8453 100644
--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h
+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h
@@ -75,6 +75,8 @@ protected:
         return false;
     }
 
+    int numCachedNewItems() { return rootPaintController().m_numCachedNewItems; }
+
 private:
     bool m_originalSlimmingPaintInvalidationEnabled;
     bool m_originalSlimmingPaintV2Enabled;
@@ -129,11 +131,8 @@ public:
 
 // 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