Support fragment URLs for more kinds of SVG images

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

 /*
  * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
  * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
  * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
@@ skipping 10 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/layout/LayoutImageResource.h"
 
-#include "core/html/HTMLImageElement.h"
+#include "core/dom/Element.h"
 #include "core/layout/LayoutImage.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 
 namespace blink {
 
 LayoutImageResource::LayoutImageResource()
     : m_layoutObject(nullptr)
     , m_cachedImage(nullptr)
 {
 }
@@ skipping 55 matching lines @@
     LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, multiplier, ImageResource::IntrinsicSize);
     if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && size.height())
         size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());
     return size;
 }
 
 PassRefPtr<Image> LayoutImageResource::image(const IntSize& containerSize, float zoom) const
 {
     RefPtr<Image> image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
     if (image->isSVGImage()) {
+        KURL url;
         SVGImage* svgImage = toSVGImage(image.get());
         Node* node = m_layoutObject->node();
-        if (node && isHTMLImageElement(node)) {
-            const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL();
-            KURL url = node->document().completeURL(urlString);
-            svgImage->setURL(url);
+        if (node && node->isElementNode()) {
+            const AtomicString& urlString = toElement(node)->imageSourceURL();
+            url = node->document().completeURL(urlString);
         }
-        return SVGImageForContainer::create(svgImage, containerSize, zoom);
+        return SVGImageForContainer::create(svgImage, containerSize, zoom, url);
     }
     return image;
 }
 
 bool LayoutImageResource::maybeAnimated() const
 {
     Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
     return image->maybeAnimated();
 }
 
 } // namespace blink