NOT FOR LANDING Allocate SVGImageForContainer on demand

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/NinePieceImagePainter.h"
 
 #include "core/layout/ImageQualityController.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/paint/BoxPainter.h"
 #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"
 
 namespace blink {
 
 NinePieceImagePainter::NinePieceImagePainter(const LayoutBoxModelObject& layoutObject)
     : m_layoutObject(layoutObject)
 {
 }
@@ skipping 13 matching lines @@
 
     // FIXME: border-image is broken with full page zooming when tiling has to happen, since the tiling function
     // doesn't have any understanding of the zoom that is in effect on the tile.
     LayoutRect rectWithOutsets = rect;
     rectWithOutsets.expand(style.imageOutsets(ninePieceImage));
     IntRect borderImageRect = pixelSnappedIntRect(rectWithOutsets);
 
     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());
     InterpolationQuality previousInterpolationQuality = graphicsContext->imageInterpolationQuality();
     graphicsContext->setImageInterpolationQuality(interpolationQuality);
 
     TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data",
         InspectorPaintImageEvent::data(m_layoutObject, *styleImage));
 
     for (NinePiece piece = MinPiece; piece < MaxPiece; ++piece) {
         NinePieceImageGrid::NinePieceDrawInfo drawInfo = grid.getNinePieceDrawInfo(piece);
 
         if (drawInfo.isDrawable) {
             if (drawInfo.isCornerPiece) {
                 graphicsContext->drawImage(image.get(), drawInfo.destination, drawInfo.source, op);
             } else {
                 graphicsContext->drawTiledImage(image.get(), enclosingIntRect(drawInfo.destination),
                     enclosingIntRect(drawInfo.source), drawInfo.tileScale, drawInfo.tileRule.horizontal,
                     drawInfo.tileRule.vertical, op);
             }
         }
     }
 
     graphicsContext->setImageInterpolationQuality(previousInterpolationQuality);
     return true;
 }
 
 } // namespace blink