Do not emit display items for masks and clips that are already cached

Source/core/paint/SVGMaskPainter.cpp

Index: Source/core/paint/SVGMaskPainter.cpp
diff --git a/Source/core/paint/SVGMaskPainter.cpp b/Source/core/paint/SVGMaskPainter.cpp
index 6b4e4d75005268129d93c8fc9bfa42f28e369e53..6f6bbac23d50e381758671b12ab62eecda455897 100644
--- a/Source/core/paint/SVGMaskPainter.cpp
+++ b/Source/core/paint/SVGMaskPainter.cpp
@@ -52,7 +52,7 @@ void SVGMaskPainter::finishEffect(const LayoutObject& object, GraphicsContext* c
         ColorFilter maskLayerFilter = m_mask.style()->svgStyle().maskType() == MT_LUMINANCE
             ? ColorFilterLuminanceToAlpha : ColorFilterNone;
         CompositingRecorder maskCompositing(*context, object, SkXfermode::kDstIn_Mode, 1, &paintInvalidationRect, maskLayerFilter);
-        drawMaskForLayoutObject(context, object, object.objectBoundingBox());
+        drawMaskForLayoutObject(context, object, object.objectBoundingBox(), paintInvalidationRect);
     }
 
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
@@ -66,23 +66,21 @@ void SVGMaskPainter::finishEffect(const LayoutObject& object, GraphicsContext* c
     }
 }
 
-void SVGMaskPainter::drawMaskForLayoutObject(GraphicsContext* context, const LayoutObject& layoutObject, const FloatRect& targetBoundingBox)
+void SVGMaskPainter::drawMaskForLayoutObject(GraphicsContext* context, const LayoutObject& layoutObject, const FloatRect& targetBoundingBox, const FloatRect& targetPaintInvalidationRect)
 {
     ASSERT(context);
 
     AffineTransform contentTransformation;
     RefPtr<const SkPicture> maskContentPicture = m_mask.createContentPicture(contentTransformation, targetBoundingBox, context);
 
-    TransformRecorder recorder(*context, layoutObject, contentTransformation);
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        ASSERT(context->displayItemList());
-        if (context->displayItemList()->displayItemConstructionIsDisabled())
-            return;
-        context->displayItemList()->add(DrawingDisplayItem::create(layoutObject, DisplayItem::SVGMask, maskContentPicture));
-    } else {
-        DrawingDisplayItem maskPicture(layoutObject, DisplayItem::SVGClip, maskContentPicture);
-        maskPicture.replay(*context);
-    }
+    LayoutObjectDrawingRecorder drawingRecorder(*context, layoutObject, DisplayItem::SVGMask, targetPaintInvalidationRect);
+    if (drawingRecorder.canUseCachedDrawing())
+        return;
+
+    context->save();
+    context->concatCTM(contentTransformation);
+    context->drawPicture(maskContentPicture.get());
+    context->restore();
 }
 
 }