Change SkPictureBuilder strategy to not create nested recorders

Source/core/paint/SVGMaskPainter.cpp

 // 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.
 
 #include "config.h"
 #include "core/paint/SVGMaskPainter.h"
 
 #include "core/layout/PaintInfo.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
 #include "core/paint/CompositingRecorder.h"
+#include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/graphics/paint/CompositingDisplayItem.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 
 namespace blink {
 
 bool SVGMaskPainter::prepareEffect(const LayoutObject& object, GraphicsContext* context)
 {
     ASSERT(context);
@@ skipping 42 matching lines @@
 
 void SVGMaskPainter::drawMaskForLayoutObject(GraphicsContext* context, const LayoutObject& layoutObject, const FloatRect& targetBoundingBox)
 {
     ASSERT(context);
 
     AffineTransform contentTransformation;
     RefPtr<const SkPicture> maskContentPicture = m_mask.createContentPicture(contentTransformation, targetBoundingBox);
 
     TransformRecorder recorder(*context, layoutObject, contentTransformation);
 
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        ASSERT(context->displayItemList());
-        context->displayItemList()->add(DrawingDisplayItem::create(layoutObject, DisplayItem::SVGMask, maskContentPicture));
-    } else {
-        DrawingDisplayItem maskPicture(layoutObject, DisplayItem::SVGMask, maskContentPicture);
-        maskPicture.replay(*context);
-    }
+    LayoutObjectDrawingRecorder drawingRecorder(*context, layoutObject, DisplayItem::SVGMask, LayoutRect::infiniteIntRect());
+    if (!drawingRecorder.canUseCachedDrawing())
+        context->drawPicture(maskContentPicture.get());
 }
 
 }