Remove the pending container size requests list

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 92 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());
-    m_pendingContainerSizeRequests.remove(static_cast<ImageResourceClient*>(c));
     if (m_imageForContainerMap)
         m_imageForContainerMap->remove(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()) {
-        // A copy of pending size requests is needed as they are deleted during Resource::switchClientsToRevalidateResource().
-        ContainerSizeRequests switchContainerSizeRequests;
-        for (const auto& containerSizeRequest : m_pendingContainerSizeRequests)
-            switchContainerSizeRequests.set(containerSizeRequest.key, containerSizeRequest.value);
-        Resource::switchClientsToRevalidatedResource();
-        ImageResource* revalidatedImageResource = toImageResource(resourceToRevalidate());
-        for (const auto& containerSizeRequest : switchContainerSizeRequests)
-            revalidatedImageResource->setContainerSizeForLayoutObject(containerSizeRequest.key, containerSizeRequest.value.first, containerSizeRequest.value.second);
-        return;
-    }
-
-    Resource::switchClientsToRevalidatedResource();
-}
-
 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);
 }
 
 void ImageResource::destroyDecodedDataIfPossible()
 {
     if (!hasClients() && !isLoading() && (!m_image || (m_image->hasOneRef() && m_image->isBitmapImage()))) {
         m_image = nullptr;
         setDecodedSize(0);
     } else if (m_image && !errorOccurred()) {
         m_image->destroyDecodedData(true);
     }
 }
 
 void ImageResource::allClientsRemoved()
 {
-    m_pendingContainerSizeRequests.clear();
     if (m_image && !errorOccurred())
         m_image->resetAnimation();
     Resource::allClientsRemoved();
 }
 
 pair<blink::Image*, float> ImageResource::brokenImage(float deviceScaleFactor)
 {
     if (deviceScaleFactor >= 2) {
         DEFINE_STATIC_REF(blink::Image, brokenImageHiRes, (blink::Image::loadPlatformResource("missingImage@2x")));
         return std::make_pair(brokenImageHiRes, 2);
@@ skipping 47 matching lines @@
 
     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) {
-        m_pendingContainerSizeRequests.set(layoutObject, SizeAndZoom(containerSize, 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));
 }
 
@@ skipping 60 matching lines @@
 {
     ResourceClientWalker<ImageResourceClient> w(m_clients);
     while (ImageResourceClient* c = w.next())
         c->imageChanged(this, changeRect);
 }
 
 void ImageResource::clear()
 {
     prune();
     clearImage();
-    m_pendingContainerSizeRequests.clear();
     setEncodedSize(0);
 }
 
 void ImageResource::setCustomAcceptHeader()
 {
     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") {
         m_image = SVGImage::create(this);
         m_imageForContainerMap = adoptPtr(new ImageForContainerMap);
     } else {
         m_image = BitmapImage::create(this);
     }
-
-    if (m_image) {
-        // Send queued container size requests.
-        if (m_image->usesContainerSize()) {
-            for (const auto& containerSizeRequest : m_pendingContainerSizeRequests)
-                setContainerSizeForLayoutObject(containerSizeRequest.key, containerSizeRequest.value.first, containerSizeRequest.value.second);
-        }
-        m_pendingContainerSizeRequests.clear();
-    }
 }
 
 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)
         m_image->setImageObserver(nullptr);
     m_image.clear();
 }
@@ skipping 193 matching lines @@
     if (node && isHTMLImageElement(node)) {
         const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL();
         KURL url = node->document().completeURL(urlString);
         imageForContainer->setURL(url);
     }
 
     return imageForContainer.get();
 }
 
 } // namespace blink