Draw recorded content directly into the containing PaintCanvas, when possible.

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
index 1e0702f1115eb21f8a86628670b5048aa03a0a3c..4706881407ba500daccb0310a707313ec4c61131 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
@@ -438,6 +438,36 @@ sk_sp<PaintRecord> SVGImage::paintRecordForCurrentFrame(const FloatRect& bounds,
   return builder.endRecording();
 }
 
+void SVGImage::paintCurrentFrame(const FloatRect& bounds,

[wkorman, 2017/04/01 00:32:40]

This looks identical to SVGImage::paintRecordForCurrentFrame (which I assume is
still needed/used for its callsite in applyShaderInternal) except for taking
canvas param, can we share the code in one method and use a default param w/
nullptr check or similar to just specialize endRecording?

[chrishtr, 2017/04/01 04:05:47]

Good idea, done.

+                                 const KURL& url,
+                                 PaintCanvas& canvas) {
+  DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+  DCHECK(m_page);
+  FrameView* view = toLocalFrame(m_page->mainFrame())->view();
+  view->resize(containerSize());
+
+  // Always call processUrlFragment, even if the url is empty, because
+  // there may have been a previous url/fragment that needs to be reset.
+  view->processUrlFragment(url);
+
+  // If the image was reset, we need to rewind the timeline back to 0. This
+  // needs to be done before painting, or else we wouldn't get the correct
+  // reset semantics (we'd paint the "last" frame rather than the one at
+  // time=0.) The reason we do this here and not in resetAnimation() is to
+  // avoid setting timers from the latter.
+  flushPendingTimelineRewind();
+
+  IntRect intBounds(enclosingIntRect(bounds));
+  PaintRecordBuilder builder(intBounds, nullptr, nullptr,
+                             m_paintController.get());
+
+  view->updateAllLifecyclePhasesExceptPaint();
+  view->paint(builder.context(), CullRect(intBounds));
+  DCHECK(!view->needsLayout());
+
+  builder.endRecording(canvas);
+}
+
 void SVGImage::drawInternal(PaintCanvas* canvas,
                             const PaintFlags& flags,
                             const FloatRect& dstRect,
@@ -466,7 +496,7 @@ void SVGImage::drawInternal(PaintCanvas* canvas,
     canvas->save();
     canvas->clipRect(enclosingIntRect(dstRect));
     canvas->concat(affineTransformToSkMatrix(transform));
-    canvas->PlaybackPaintRecord(paintRecordForCurrentFrame(srcRect, url));
+    paintCurrentFrame(srcRect, url, *canvas);
     canvas->restore();
   }