[WIP] ImageResourceClient->ImageResourceObserver

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
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "core/fetch/ImageResource.h"
 
-#include "core/fetch/ImageResourceClient.h"
+#include "core/fetch/ImageResourceObserver.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/svg/graphics/SVGImage.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 64 matching lines @@
 }
 
 void ImageResource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& options)
 {
     if (!fetcher || fetcher->autoLoadImages())
         Resource::load(fetcher, options);
     else
         setLoading(false);
 }
 
-void ImageResource::didAddClient(ResourceClient* c)
+void ImageResource::addObserver(ImageResourceObserver* observer)
 {
     if (m_data && !m_image && !errorOccurred()) {
         createImage();
         m_image->setData(m_data, true);
     }
 
-    ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
     if (m_image && !m_image->isNull())
-        static_cast<ImageResourceClient*>(c)->imageChanged(this);
-
-    Resource::didAddClient(c);
+        observer->imageChanged(this);
+    m_observers.add(observer);
 }
 
-void ImageResource::didRemoveClient(ResourceClient* c)
+void ImageResource::removeObserver(ImageResourceObserver* observer)
 {
-    ASSERT(c);
-    ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
+    ASSERT(observer);
+    ASSERT(m_observers.contains(observer));
+    m_observers.remove(observer);
+}
 
-    Resource::didRemoveClient(c);
+ResourcePriority ImageResource::priorityFromClients()
+{
+    ResourcePriority priority;
+    for (const auto& observer : m_observers) {
+        ResourcePriority nextPriority = observer.key->computeResourcePriority();
+        if (nextPriority.visibility == ResourcePriority::NotVisible)
+            continue;
+        priority.visibility = ResourcePriority::Visible;
+        priority.intraPriorityValue += nextPriority.intraPriorityValue;
+    }
+    return priority;
 }
 
 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::destroyDecodedDataForFailedRevalidation()
 {
@@ skipping 96 matching lines @@
 }
 
 void ImageResource::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     if (m_image)
         m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 void ImageResource::notifyObservers(const IntRect* changeRect)
 {
-    ResourceClientWalker<ImageResourceClient> w(m_clients);
-    while (ImageResourceClient* c = w.next())
-        c->imageChanged(this, changeRect);
-
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next())
-        c->imageChanged(this, changeRect);
+    WillBeHeapVector<ImageResourceObserver*> observers(m_observers.size());
+    size_t index = 0;
+    for (const auto& observer : m_observers)
+        observers[index++] = observer.key;
+    for (auto observer : observers)
+        observer->imageChanged(this, changeRect);
 }
 
 void ImageResource::clear()
 {
     prune();
     clearImage();
     setEncodedSize(0);
 }
 
 void ImageResource::setCustomAcceptHeader()
@@ skipping 117 matching lines @@
     // to update MemoryCache.
     if (decodedSize() != 0)
         Resource::didAccessDecodedData();
 }
 
 bool ImageResource::shouldPauseAnimation(const blink::Image* image)
 {
     if (!image || image != m_image)
         return false;
 
-    ResourceClientWalker<ImageResourceClient> w(m_clients);
-    while (ImageResourceClient* c = w.next()) {
-        if (c->willRenderImage(this))
+    for (const auto& observer : m_observers) {
+        if (observer.key->willRenderImage())
             return false;
     }
-
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next()) {
-        if (c->willRenderImage(this))
-            return false;
-    }
-
     return true;
 }
 
 void ImageResource::animationAdvanced(const blink::Image* image)
 {
     if (!image || image != m_image)
         return;
     notifyObservers();
 }
 
 void ImageResource::updateImageAnimationPolicy()
 {
     if (!m_image)
         return;
 
     ImageAnimationPolicy newPolicy = ImageAnimationPolicyAllowed;
-    ResourceClientWalker<ImageResourceClient> w(m_clients);
-    while (ImageResourceClient* c = w.next()) {
-        if (c->getImageAnimationPolicy(this, newPolicy))
+    for (const auto& observer : m_observers) {
+        if (observer.key->getImageAnimationPolicy(newPolicy))
             break;
     }
 
-    ResourceClientWalker<ImageResourceClient> w2(m_finishedClients);
-    while (ImageResourceClient* c = w2.next()) {
-        if (c->getImageAnimationPolicy(this, newPolicy))
-            break;
-    }
-
     if (m_image->animationPolicy() != newPolicy) {
         m_image->resetAnimation();
         m_image->setAnimationPolicy(newPolicy);
     }
 }
 
 void ImageResource::reloadIfLoFi(ResourceFetcher* fetcher)
 {
     if (!m_response.httpHeaderField("chrome-proxy").contains("q=low"))
         return;
@@ skipping 20 matching lines @@
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 bool ImageResource::loadingMultipartContent() const
 {
     return m_loader && m_loader->loadingMultipartContent();
 }
 
 } // namespace blink