Support fragment URLs for all kinds of SVG images

Source/core/svg/graphics/SVGImageForContainer.h

Index: Source/core/svg/graphics/SVGImageForContainer.h
diff --git a/Source/core/svg/graphics/SVGImageForContainer.h b/Source/core/svg/graphics/SVGImageForContainer.h
index 23bbf308d726ab68fe812dae57bee36b69759d85..1d7ece2d54ee6d6831833f9cdfd8b62cdd38457d 100644
--- a/Source/core/svg/graphics/SVGImageForContainer.h
+++ b/Source/core/svg/graphics/SVGImageForContainer.h
@@ -36,15 +36,14 @@ namespace blink {
 
 class SVGImageForContainer final : public Image {
 public:
-    static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatSize& containerSize, float zoom)
+    static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatSize& containerSize, float zoom, const KURL& urlWithFragment)
     {
-        return adoptRef(new SVGImageForContainer(image, containerSize, zoom));
+        return adoptRef(new SVGImageForContainer(image, containerSize, zoom, urlWithFragment));
     }
 
     bool isSVGImage() const override { return true; }
 
     IntSize size() const override;
-    void setURL(const KURL& url) { m_image->setURL(url); }
 
     bool usesContainerSize() const override { return m_image->usesContainerSize(); }
     bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
@@ -64,10 +63,11 @@ public:
     PassRefPtr<SkImage> imageForCurrentFrame() override;
 
 private:
-    SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom)
+    SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom, const KURL& urlWithFragment)
         : m_image(image)
         , m_containerSize(containerSize)
         , m_zoom(zoom)
+        , m_urlWithFragment(urlWithFragment)
     {
     }
 
@@ -76,7 +76,9 @@ private:
     SVGImage* m_image;
     const FloatSize m_containerSize;
     const float m_zoom;
+    KURL m_urlWithFragment;

[davve, 2015/09/09 14:22:53]

I've come to realize that associating url fragments with SVGImageForContainer
isn't as a clean fit as I initially thought.

Since SVGImageForContainer is associated per layout object, this system will
break down if there is more than one fragment URL per layout object. I.e. adding
a "background-image: url('some.svg#red');" to an img with src=some.svg#green
will make them compete for the URL in SVGImageForContainer. (In current patch,
the background seems to win)

May have to go back to the drawing board on this one.

 };
+
 }
 
 #endif // SVGImageForContainer_h