Add PictureRecorder for sp/non-sp recording without an existing context

Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 39 matching lines @@
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/LengthFunctions.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "platform/graphics/paint/DisplayItemListContextRecorder.h"
+#include "platform/graphics/paint/SkPictureBuilder.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 SVGImage::SVGImage(ImageObserver* observer)
     : Image(observer)
 {
 }
 
@@ skipping 166 matching lines @@
     const IntSize& repeatSpacing)
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
 
     // Expand the tile to account for repeat spacing.
     FloatRect spacedTile(tile);
     spacedTile.expand(repeatSpacing);
 
-    OwnPtr<DisplayItemList> displayItemList;
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled())
-        displayItemList = DisplayItemList::create();
-
-    // Record using a dedicated GC, to avoid inheriting unwanted state (pending color filters
-    // for example must be applied atomically during the final fill/composite phase).
-    GraphicsContext recordingContext(displayItemList.get());
-    recordingContext.beginRecording(spacedTile);
+    SkPictureBuilder pictureBuilder(spacedTile);
     {
         // When generating an expanded tile, make sure we don't draw into the spacing area.
         OwnPtr<FloatClipRecorder> clipRecorder;
         if (tile != spacedTile)
-            clipRecorder = adoptPtr(new FloatClipRecorder(recordingContext, *this, PaintPhaseForeground, tile));
-        drawForContainer(&recordingContext, containerSize, zoom, tile, srcRect, SkXfermode::kSrcOver_Mode);
+            clipRecorder = adoptPtr(new FloatClipRecorder(pictureBuilder.context(), *this, PaintPhaseForeground, tile));
+        drawForContainer(&pictureBuilder.context(), containerSize, zoom, tile, srcRect, SkXfermode::kSrcOver_Mode);
     }
 
-    if (displayItemList)
-        displayItemList->commitNewDisplayItemsAndReplay(recordingContext);
-
-    RefPtr<const SkPicture> tilePicture = recordingContext.endRecording();
+    RefPtr<const SkPicture> tilePicture = pictureBuilder.endRecording();
 
     SkMatrix patternTransform;
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
     RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(
         tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
         &patternTransform, nullptr));
 
     SkPaint paint;
     paint.setShader(patternShader.get());
     paint.setXfermodeMode(compositeOp);
@@ skipping 190 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }