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

third_party/WebKit/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 420 matching lines @@
   PaintRecordBuilder builder(intBounds, nullptr, nullptr,
                              m_paintController.get());
 
   view->updateAllLifecyclePhasesExceptPaint();
   view->paint(builder.context(), CullRect(intBounds));
   DCHECK(!view->needsLayout());
 
   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,
                             const FloatRect& srcRect,
                             RespectImageOrientationEnum,
                             ImageClampingMode,
                             const KURL& url) {
   {
     PaintCanvasAutoRestore ar(canvas, false);
     if (drawNeedsLayer(flags)) {
       SkRect layerRect = dstRect;
       canvas->saveLayer(&layerRect, &flags);
     }
     // We can only draw the entire frame, clipped to the rect we want. So
     // compute where the top left of the image would be if we were drawing
     // without clipping, and translate accordingly.
     FloatSize scale(dstRect.width() / srcRect.width(),
                     dstRect.height() / srcRect.height());
     FloatSize topLeftOffset(srcRect.location().x() * scale.width(),
                             srcRect.location().y() * scale.height());
     FloatPoint destOffset = dstRect.location() - topLeftOffset;
     AffineTransform transform =
         AffineTransform::translation(destOffset.x(), destOffset.y());
     transform.scale(scale.width(), scale.height());
 
     canvas->save();
     canvas->clipRect(enclosingIntRect(dstRect));
     canvas->concat(affineTransformToSkMatrix(transform));
-    canvas->PlaybackPaintRecord(paintRecordForCurrentFrame(srcRect, url));
+    paintCurrentFrame(srcRect, url, *canvas);
     canvas->restore();
   }
 
   // Start any (SMIL) animations if needed. This will restart or continue
   // animations if preceded by calls to resetAnimation or stopAnimation
   // respectively.
   startAnimation();
 }
 
 LayoutReplaced* SVGImage::embeddedReplacedContent() const {
@@ skipping 205 matching lines @@
   }
 
   return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const {
   return "svg";
 }
 
 }  // namespace blink