| Index: Source/core/fetch/ImageResource.cpp
|
| diff --git a/Source/core/fetch/ImageResource.cpp b/Source/core/fetch/ImageResource.cpp
|
| index 9151123f9e4c055c943f74353f60064f0818315c..766c1c8c1ba93da77774f7ac28520e890687fe67 100644
|
| --- a/Source/core/fetch/ImageResource.cpp
|
| +++ b/Source/core/fetch/ImageResource.cpp
|
| @@ -212,7 +212,7 @@ blink::Image* ImageResource::imageForLayoutObject(const LayoutObject* layoutObje
|
| 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)
|
| {
|
| if (containerSize.isEmpty())
|
| return;
|
| @@ -227,7 +227,7 @@ void ImageResource::setContainerSizeForLayoutObject(const ImageResourceClient* l
|
|
|
| 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
|
| @@ -525,13 +525,6 @@ Image* ImageResource::svgImageForLayoutObject(const LayoutObject* layoutObject)
|
| 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();
|
| }
|
|
|
|
|