NOT FOR LANDING Allocate SVGImageForContainer on demand

third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp

Index: third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp
index c72e025e71b6011abc6bfd8bf04bb923ded1f844..af21e1affac7836cc3da613d698ce18278787dc1 100644
--- a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp
@@ -11,6 +11,7 @@
 #include "core/paint/NinePieceImageGrid.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/NinePieceImage.h"
+#include "core/svg/graphics/SVGImageForContainer.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/GraphicsContext.h"
@@ -44,14 +45,11 @@ bool NinePieceImagePainter::paint(GraphicsContext* graphicsContext, const Layout
     IntSize imageSize = m_layoutObject.calculateImageIntrinsicDimensions(styleImage, borderImageRect.size(),
         LayoutBoxModelObject::DoNotScaleByEffectiveZoom);
 
-    // If both values are 'auto' then the intrinsic width and/or height of the image should be used, if any.
-    styleImage->setContainerSizeForLayoutObject(&m_layoutObject, imageSize, style.effectiveZoom());
-
     IntRectOutsets borderWidths(style.borderTopWidth(), style.borderRightWidth(),
         style.borderBottomWidth(), style.borderLeftWidth());
     NinePieceImageGrid grid(ninePieceImage, imageSize, borderImageRect, borderWidths);
 
-    RefPtr<Image> image = styleImage->image(&m_layoutObject, imageSize);
+    RefPtr<Image> image = styleImage->image(&m_layoutObject, imageSize, style.effectiveZoom(), styleImage->url());
 
     InterpolationQuality interpolationQuality = BoxPainter::chooseInterpolationQuality(m_layoutObject,
         graphicsContext, image.get(), 0, rectWithOutsets.size());