Generalize ImageForContainer

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 75 matching lines @@
 
     Resource::didAddClient(c);
 }
 
 void ImageResource::didRemoveClient(ResourceClient* c)
 {
     ASSERT(c);
     ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
 
     m_pendingContainerSizeRequests.remove(static_cast<ImageResourceClient*>(c));
-    if (m_svgImageCache)
-        m_svgImageCache->removeClientFromCache(static_cast<ImageResourceClient*>(c));
+    if (m_imageCache)
+        m_imageCache->removeClientFromCache(static_cast<ImageResourceClient*>(c));
 
     Resource::didRemoveClient(c);
 }
 
 void ImageResource::switchClientsToRevalidatedResource()
 {
     ASSERT(resourceToRevalidate());
     ASSERT(resourceToRevalidate()->isImage());
     // Pending container size requests need to be transferred to the revalidated resource.
     if (!m_pendingContainerSizeRequests.isEmpty()) {
@@ skipping 60 matching lines @@
         // 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 WebCore::Image::nullImage();
 
     if (m_image->isSVGImage()) {
-        WebCore::Image* image = m_svgImageCache->imageForRenderer(renderer);
+        WebCore::Image* image = m_imageCache->imageForRenderer(renderer);
         if (image != WebCore::Image::nullImage())
             return image;
     }
 
     return m_image.get();
 }
 
 void ImageResource::setContainerSizeForRenderer(const ImageResourceClient* renderer, const IntSize& containerSize, float containerZoom)
 {
     if (containerSize.isEmpty())
         return;
     ASSERT(renderer);
     ASSERT(containerZoom);
     if (!m_image) {
         m_pendingContainerSizeRequests.set(renderer, SizeAndZoom(containerSize, containerZoom));
         return;
     }
-    if (!m_image->isSVGImage()) {
-        m_image->setContainerSize(containerSize);
-        return;
-    }
 
-    m_svgImageCache->setContainerSizeForRenderer(renderer, containerSize, containerZoom);
+    m_imageCache->setContainerSizeForRenderer(renderer, containerSize, containerZoom);
 }
 
 bool ImageResource::usesImageContainerSize() const
 {
     if (m_image)
         return m_image->usesContainerSize();
 
     return false;
 }
 
@@ skipping 17 matching lines @@
 {
     ASSERT(!isPurgeable());
 
     if (!m_image)
         return IntSize();
 
     LayoutSize imageSize;
 
     if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
         imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation();
-    else if (m_image->isSVGImage() && sizeType == NormalSize)
-        imageSize = m_svgImageCache->imageSizeForRenderer(renderer);
+    else if (sizeType == NormalSize)
+        imageSize = m_imageCache->imageSizeForRenderer(renderer);
     else
         imageSize = m_image->size();
 
     if (multiplier == 1.0f)
         return imageSize;
 
     // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
     float widthScale = m_image->hasRelativeWidth() ? 1.0f : multiplier;
     float heightScale = m_image->hasRelativeHeight() ? 1.0f : multiplier;
     LayoutSize minimumSize(imageSize.width() > 0 ? 1 : 0, imageSize.height() > 0 ? 1 : 0);
@@ skipping 29 matching lines @@
     DEFINE_STATIC_LOCAL(const AtomicString, acceptWebP, ("image/webp,*/*;q=0.8", AtomicString::ConstructFromLiteral));
     setAccept(acceptWebP);
 }
 
 inline void ImageResource::createImage()
 {
     // Create the image if it doesn't yet exist.
     if (m_image)
         return;
 
-    if (m_response.mimeType() == "image/svg+xml") {
-        RefPtr<SVGImage> svgImage = SVGImage::create(this);
-        m_svgImageCache = SVGImageCache::create(svgImage.get());
-        m_image = svgImage.release();
-    } else {
+    if (m_response.mimeType() == "image/svg+xml")
+        m_image = SVGImage::create(this);
+    else
         m_image = BitmapImage::create(this);
-    }
+
+    m_imageCache = ImageCache::create(m_image.get());
 
     if (m_image) {
         // Send queued container size requests.
         if (m_image->usesContainerSize()) {
             for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
                 setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
         }
         m_pendingContainerSizeRequests.clear();
     }
 }
@@ skipping 135 matching lines @@
 
 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer)
 {
     WebCore::Image* image = imageForRenderer(renderer);
     if (image->isBitmapImage())
         image->nativeImageForCurrentFrame(); // force decode
     return image->currentFrameKnownToBeOpaque();
 }
 
 } // namespace WebCore