Use SkPictureBuilder in SVGShapePainter, and generalize SkPictureBuilder.

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 267 matching lines @@
     float opacity = context->getNormalizedAlpha() / 255.f;
 
     FrameView* view = frameView();
     view->resize(containerSize());
 
     // Always call scrollToFragment, even if the url is empty, because
     // there may have been a previous url/fragment that needs to be reset.
     view->scrollToFragment(m_url);
 
     {
-        DisplayItemListContextRecorder contextRecorder(*context);
-        GraphicsContext& paintContext = contextRecorder.context();
+        LayoutRect paintRect(enclosingIntRect(dstRect));
+        SkPictureBuilder pictureBuilder(paintRect);
 
-        ClipRecorder clipRecorder(paintContext, *this, DisplayItem::ClipNodeImage, LayoutRect(enclosingIntRect(dstRect)));
+        {
+            ClipRecorder clipRecorder(pictureBuilder.context(), *this, DisplayItem::ClipNodeImage, paintRect);
 
-        bool hasCompositing = compositeOp != SkXfermode::kSrcOver_Mode;
-        OwnPtr<CompositingRecorder> compositingRecorder;
-        if (hasCompositing || opacity < 1)
-            compositingRecorder = adoptPtr(new CompositingRecorder(paintContext, *this, compositeOp, opacity));
+            bool hasCompositing = compositeOp != SkXfermode::kSrcOver_Mode;
+            OwnPtr<CompositingRecorder> compositingRecorder;
+            if (hasCompositing || opacity < 1)
+                compositingRecorder = adoptPtr(new CompositingRecorder(pictureBuilder.context(), *this, compositeOp, opacity));
 
-        // 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());
-        TransformRecorder transformRecorder(paintContext, *this, transform);
+            // 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());
+            TransformRecorder transformRecorder(pictureBuilder.context(), *this, transform);
 
-        view->updateLayoutAndStyleForPainting();
-        view->paint(&paintContext, enclosingIntRect(srcRect));
+            view->updateLayoutAndStyleForPainting();
+            view->paint(&pictureBuilder.context(), enclosingIntRect(srcRect));
+        }
+
+        pictureBuilder.endRecording()->playback(context->canvas());
         ASSERT(!view->needsLayout());
     }
 
     if (imageObserver())
         imageObserver()->didDraw(this);
 
     // Start any (SMIL) animations if needed. This will restart or continue
     // animations if preceded by calls to resetAnimation or stopAnimation
     // respectively.
     startAnimation();
@@ skipping 149 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }