Support fragment URLs for all kinds of SVG images

Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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
@@ skipping 12 matching lines @@
 
 #include "config.h"
 #include "core/fetch/ImageResource.h"
 
 #include "core/fetch/ImageResourceClient.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourceClientWalker.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
-#include "core/html/HTMLImageElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/BitmapImage.h"
 #include "public/platform/Platform.h"
 #include "wtf/CurrentTime.h"
@@ skipping 161 matching lines @@
 
     if (m_image->isSVGImage()) {
         blink::Image* image = svgImageForLayoutObject(layoutObject);
         if (image != blink::Image::nullImage())
             return image;
     }
 
     return m_image.get();
 }
 
-void ImageResource::setContainerSizeForLayoutObject(const ImageResourceClient* layoutObject, const IntSize& containerSize, float containerZoom)
+void ImageResource::setContainerParametersForLayoutObject(const ImageResourceClient* layoutObject, const IntSize& containerSize, float containerZoom, const KURL& urlWithFragment)

[f(malita), 2015/09/08 18:41:19]

Is the fragment not visible at the Resource level? There's code to track it, at
least temporarily:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

If the super class has access to the fragment maybe we can use that instead or
relying on an explicit argument - then we could drop all the related plumbing.

[davve, 2015/09/08 19:12:25]

m_fragmentIdentifierForRequest is emptied on ::load so not generally accessible
at paint time as the code looks today. Having the fragment at the resource level
seems wrong in general to me, since we want to use the same resource regardless
of how many urls with fragments that point to the same actual resource.

[f(malita), 2015/09/08 20:45:51]

Yup, but I can't tell whether that part is needed/important (why only observe it
on the first load? do we even call load more than once?).
Makes sense.

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

Fwiw, on a simple test like
svg-resource-fragment-identifier-background.html attached in the CL, I
can't observe m_fragmentIdentifierForRequest actually being set.

Already in ResourceFetcher::requestResource there is a call to
removeFragmentIdentifierIfNeeded before hitting/checking the cache,
right before the resource is created (when not found in cache) so I'm
not sure when m_fragmentIdentifierForRequest is used.

 {
     if (containerSize.isEmpty())
         return;
     ASSERT(layoutObject);
     ASSERT(containerZoom);
     if (!m_image)
         return;
     if (!m_image->isSVGImage()) {
         m_image->setContainerSize(containerSize);
         return;
     }
 
     FloatSize containerSizeWithoutZoom(containerSize);
     containerSizeWithoutZoom.scale(1 / containerZoom);
-    m_imageForContainerMap->set(layoutObject, SVGImageForContainer::create(toSVGImage(m_image.get()), containerSizeWithoutZoom, containerZoom));
+    m_imageForContainerMap->set(layoutObject, SVGImageForContainer::create(toSVGImage(m_image.get()), containerSizeWithoutZoom, containerZoom, urlWithFragment));
 }
 
 bool ImageResource::usesImageContainerSize() const
 {
     if (m_image)
         return m_image->usesContainerSize();
 
     return false;
 }
 
@@ skipping 277 matching lines @@
     if (!layoutObject)
         return Image::nullImage();
 
     ImageForContainerMap::iterator it = m_imageForContainerMap->find(layoutObject);
     if (it == m_imageForContainerMap->end())
         return Image::nullImage();
 
     RefPtr<SVGImageForContainer> imageForContainer = it->value;
     ASSERT(!imageForContainer->size().isEmpty());
 
-    Node* node = layoutObject->node();
-    if (node && isHTMLImageElement(node)) {
-        const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL();
-        KURL url = node->document().completeURL(urlString);
-        imageForContainer->setURL(url);
-    }
-
     return imageForContainer.get();
 }
 
 bool ImageResource::loadingMultipartContent() const
 {
     return m_loader && m_loader->loadingMultipartContent();
 }
 
 } // namespace blink