Wrap SVGImage for container during paint

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 10 matching lines @@
  *
  */
 
 #include "config.h"
 #include "core/style/StyleFetchedImage.h"
 
 #include "core/css/CSSImageValue.h"
 #include "core/fetch/ImageResource.h"
 #include "core/layout/LayoutObject.h"
 #include "core/svg/graphics/SVGImage.h"
+#include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
 StyleFetchedImage::StyleFetchedImage(ImageResource* image, Document* document)
     : m_image(image)
     , m_document(document)
 {
     m_isImageResource = true;
     m_image->addClient(this);
 }
@@ skipping 56 matching lines @@
 void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 bool StyleFetchedImage::usesImageContainerSize() const
 {
     return m_image->usesImageContainerSize();
 }
 
-void StyleFetchedImage::setContainerSizeForLayoutObject(const LayoutObject* layoutObject, const IntSize& imageContainerSize, float imageContainerZoomFactor)
-{
-    m_image->setContainerSizeForLayoutObject(layoutObject, imageContainerSize, imageContainerZoomFactor);
-}
-
 void StyleFetchedImage::addClient(LayoutObject* layoutObject)
 {
     m_image->addClient(layoutObject);
 }
 
 void StyleFetchedImage::removeClient(LayoutObject* layoutObject)
 {
     m_image->removeClient(layoutObject);
 }
 
 void StyleFetchedImage::notifyFinished(Resource* resource)
 {
     if (m_document && m_image && m_image->image() && m_image->image()->isSVGImage())
         toSVGImage(m_image->image())->updateUseCounters(*m_document);
     // Oilpan: do not prolong the Document's lifetime.
     m_document.clear();
 }
 
-PassRefPtr<Image> StyleFetchedImage::image(const LayoutObject* layoutObject, const IntSize&) const
+PassRefPtr<Image> StyleFetchedImage::image(const LayoutObject*, const IntSize& containerSize, float zoom) const
 {
-    return m_image->imageForLayoutObject(layoutObject);
+    RefPtr<Image> image = m_image->image();
+    if (image->isSVGImage())
+        return SVGImageForContainer::create(toSVGImage(image.get()), containerSize, zoom);
+    return image;
 }
 
 bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return m_image->currentFrameKnownToBeOpaque(layoutObject);
 }
 
 DEFINE_TRACE(StyleFetchedImage)
 {
     visitor->trace(m_document);
     StyleImage::trace(visitor);
 }
 
 }