Support fragment URLs for all kinds of SVG images

Source/core/svg/graphics/SVGImageForContainer.h

 /*
  * Copyright (C) 2013 Google 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 18 matching lines @@
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/Image.h"
 #include "platform/weborigin/KURL.h"
 
 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(); }
     bool hasRelativeHeight() const override { return m_image->hasRelativeHeight(); }
     void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override
     {
         m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
     }
 
     void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, RespectImageOrientationEnum, ImageClampingMode) override;
 
     void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing) override;
 
     // FIXME: Implement this to be less conservative.
     bool currentFrameKnownToBeOpaque() override { return false; }
 
     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)
     {
     }
 
     void destroyDecodedData(bool) override { }
 
     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