Wrap SVGImage for container during paint

third_party/WebKit/Source/core/layout/LayoutImageResource.h

Index: third_party/WebKit/Source/core/layout/LayoutImageResource.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.h b/third_party/WebKit/Source/core/layout/LayoutImageResource.h
index 788e7949e0c5a5794722c6dc6fff3752b5f068cd..556dfe827b6701a673bd88793178ab4e83297a35 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.h
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.h
@@ -55,18 +55,13 @@ public:
     void resetAnimation();
     bool maybeAnimated() const;
 
-    virtual PassRefPtr<Image> image(const IntSize&) const
-    {
-        return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObject) : Image::nullImage();
-    }
+    virtual PassRefPtr<Image> image(const IntSize&, float) const;
     virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage->errorOccurred(); }
 
-    virtual void setContainerSizeForLayoutObject(const IntSize&);
     virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false; }
     virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false; }
 
-    virtual LayoutSize imageSize(float multiplier) const { return getImageSize(multiplier, ImageResource::NormalSize); }
-    virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSize(multiplier, ImageResource::IntrinsicSize); }

[fs, 2015/11/16 15:08:07]

(I guess this choice of keeping imageSize over intrinsicSize was made because of
the *StyleImage derivation?)

[davve, 2015/11/16 16:32:40]

Yes, but I could go the other way too. imageSize should mean the intrinsicSize
so shouldn't really matter.

+    virtual LayoutSize imageSize(float multiplier) const;
 
     virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
 
@@ -76,9 +71,6 @@ protected:
     LayoutImageResource();
     LayoutObject* m_layoutObject;
     ResourcePtr<ImageResource> m_cachedImage;
-
-private:
-    LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const;
 };
 
 } // namespace blink