Wrap SVGImage for container during paint

third_party/WebKit/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"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
@@ skipping 73 matching lines @@
     if (m_image && !m_image->isNull())
         static_cast<ImageResourceClient*>(c)->imageChanged(this);
 
     Resource::didAddClient(c);
 }
 
 void ImageResource::didRemoveClient(ResourceClient* c)
 {
     ASSERT(c);
     ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
-    if (m_imageForContainerMap)
-        m_imageForContainerMap->remove(static_cast<ImageResourceClient*>(c));
 
     Resource::didRemoveClient(c);
 }
 
 bool ImageResource::isSafeToUnlock() const
 {
     // Note that |m_image| holds a reference to |m_data| in addition to the one held by the Resource parent class.
     return !m_image || (m_image->hasOneRef() && m_data->refCount() == 2);
 }
 
@@ skipping 46 matching lines @@
         // when they need the real, deviceScaleFactor-appropriate broken image icon.
         return brokenImage(1).first;
     }
 
     if (m_image)
         return m_image.get();
 
     return blink::Image::nullImage();
 }
 
-blink::Image* ImageResource::imageForLayoutObject(const LayoutObject* layoutObject)
-{
-    ASSERT(!isPurgeable());
-
-    if (errorOccurred()) {
-        // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
-        // deviceScaleFactor from here. It is critical that callers use ImageResource::brokenImage()
-        // when they need the real, deviceScaleFactor-appropriate broken image icon.
-        return brokenImage(1).first;
-    }
-
-    if (!m_image)
-        return blink::Image::nullImage();
-
-    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)
-{
-    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));
-}
-
 bool ImageResource::usesImageContainerSize() const
 {
     if (m_image)
         return m_image->usesContainerSize();
 
     return false;
 }
 
 bool ImageResource::imageHasRelativeWidth() const
 {
@@ skipping 15 matching lines @@
 {
     ASSERT(!isPurgeable());
 
     if (!m_image)
         return LayoutSize();
 
     LayoutSize imageSize;
 
     if (m_image->isBitmapImage() && (layoutObject && layoutObject->shouldRespectImageOrientation() == RespectImageOrientation))
         imageSize = LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation());
-    else if (m_image->isSVGImage() && sizeType == NormalSize)
-        imageSize = LayoutSize(svgImageSizeForLayoutObject(layoutObject));
     else
         imageSize = LayoutSize(m_image->size());
 
     if (sizeType == IntrinsicCorrectedToDPR && m_hasDevicePixelRatioHeaderValue && m_devicePixelRatioHeaderValue > 0)
         multiplier = 1.0 / m_devicePixelRatioHeaderValue;
 
     if (multiplier == 1.0f)
         return imageSize;
 
     // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
@@ skipping 37 matching lines @@
 }
 
 inline void ImageResource::createImage()
 {
     // Create the image if it doesn't yet exist.
     if (m_image)
         return;
 
     if (m_response.mimeType() == "image/svg+xml") {
         m_image = SVGImage::create(this);
-        m_imageForContainerMap = adoptPtr(new ImageForContainerMap);
     } else {
         m_image = BitmapImage::create(this);
     }
 }
 
 inline void ImageResource::clearImage()
 {
     // If our Image has an observer, it's always us so we need to clear the back pointer
     // before dropping our reference.
     if (m_image)
@@ skipping 145 matching lines @@
 
 void ImageResource::changedInRect(const blink::Image* image, const IntRect& rect)
 {
     if (!image || image != m_image)
         return;
     notifyObservers(&rect);
 }
 
 bool ImageResource::currentFrameKnownToBeOpaque(const LayoutObject* layoutObject)
 {
-    blink::Image* image = imageForLayoutObject(layoutObject);
+    blink::Image* image = this->image();
     if (image->isBitmapImage()) {
         TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data", InspectorPaintImageEvent::data(layoutObject, *this));
         // BitmapImage::currentFrameKnownToBeOpaque() conservatively returns true for uncached
         // frames. To get an accurate answer, we pre-cache the current frame metadata.
         image->imageForCurrentFrame();
     }
     return image->currentFrameKnownToBeOpaque();
 }
 
 bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin)
 {
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!image()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
-IntSize ImageResource::svgImageSizeForLayoutObject(const LayoutObject* layoutObject) const
-{
-    IntSize imageSize = m_image->size();
-    if (!layoutObject)
-        return imageSize;
-
-    ImageForContainerMap::const_iterator it = m_imageForContainerMap->find(layoutObject);
-    if (it == m_imageForContainerMap->end())
-        return imageSize;
-
-    RefPtr<SVGImageForContainer> imageForContainer = it->value;
-    ASSERT(!imageForContainer->size().isEmpty());
-    return imageForContainer->size();
-}
-
-// FIXME: This doesn't take into account the animation timeline so animations will not
-// restart on page load, nor will two animations in different pages have different timelines.
-Image* ImageResource::svgImageForLayoutObject(const LayoutObject* layoutObject)
-{
-    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