Clean up markClientsAndObserversFinished().

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 88 matching lines @@
     ImageResourceObserverWalker walker(m_observers);
     while (auto* observer = walker.next()) {
         observer->imageNotifyFinished(this);
     }
 
     Resource::checkNotify();
 }
 
 void ImageResource::markClientsAndObserversFinished()
 {
-    while (!m_observers.isEmpty()) {
-        HashCountedSet<ImageResourceObserver*>::iterator it = m_observers.begin();
-        for (int i = it->value; i; i--) {
-            m_finishedObservers.add(it->key);
-            m_observers.remove(it);
-        }
-    }
+    HashCountedSet<ImageResourceObserver*> observers;
+    m_observers.swap(observers);
+    for (const auto& it : observers)
+        m_finishedObservers.add(it.key, it.value);
 
     Resource::markClientsAndObserversFinished();
 }
 
 void ImageResource::addObserver(ImageResourceObserver* observer)
 {
     willAddClientOrObserver();
 
     m_observers.add(observer);
 
@@ skipping 426 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink