Wrap SVGImage for container during paint

third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

 /*
  * Copyright (C) 2012 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/style/StyleFetchedImageSet.h"
 
 #include "core/css/CSSImageSetValue.h"
 #include "core/fetch/ImageResource.h"
 #include "core/layout/LayoutObject.h"
+#include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
 StyleFetchedImageSet::StyleFetchedImageSet(ImageResource* image, float imageScaleFactor, CSSImageSetValue* value)
     : m_bestFitImage(image)
     , m_imageScaleFactor(imageScaleFactor)
     , m_imageSetValue(value)
 {
     m_isImageResourceSet = true;
     m_bestFitImage->addClient(this);
@@ skipping 60 matching lines @@
 void StyleFetchedImageSet::computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     m_bestFitImage->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 bool StyleFetchedImageSet::usesImageContainerSize() const
 {
     return m_bestFitImage->usesImageContainerSize();
 }
 
-void StyleFetchedImageSet::setContainerSizeForLayoutObject(const LayoutObject* layoutObject, const IntSize& imageContainerSize, float imageContainerZoomFactor)
-{
-    m_bestFitImage->setContainerSizeForLayoutObject(layoutObject, imageContainerSize, imageContainerZoomFactor);
-}
-
 void StyleFetchedImageSet::addClient(LayoutObject* layoutObject)
 {
     m_bestFitImage->addClient(layoutObject);
 }
 
 void StyleFetchedImageSet::removeClient(LayoutObject* layoutObject)
 {
     m_bestFitImage->removeClient(layoutObject);
 }
 
-PassRefPtr<Image> StyleFetchedImageSet::image(const LayoutObject* layoutObject, const IntSize&) const
+PassRefPtr<Image> StyleFetchedImageSet::image(const LayoutObject*, const IntSize& containerSize, float zoom) const
 {
-    return m_bestFitImage->imageForLayoutObject(layoutObject);
+    RefPtr<Image> image = m_bestFitImage->image();
+    if (image && image->isSVGImage())
+        return SVGImageForContainer::create(toSVGImage(image.get()), containerSize, zoom);
+    return image;
 }
 
 bool StyleFetchedImageSet::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return m_bestFitImage->currentFrameKnownToBeOpaque(layoutObject);
 }
 
 DEFINE_TRACE(StyleFetchedImageSet)
 {
     visitor->trace(m_imageSetValue);
     StyleImage::trace(visitor);
 }
 
 } // namespace blink