Simplify SVG pending resource (re)validation

third_party/WebKit/Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann
  * <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 95 matching lines @@
 
 void SVGElement::buildPendingResourcesIfNeeded() {
   Document& document = this->document();
   if (!needsPendingResourceHandling() || !isConnected() || inUseShadowTree())
     return;
 
   SVGDocumentExtensions& extensions = document.accessSVGExtensions();
   AtomicString resourceId = getIdAttribute();
   if (!extensions.hasPendingResource(resourceId))
     return;
+  // Guaranteed by hasPendingResource.
+  DCHECK(!resourceId.isEmpty());
 
-  // Mark pending resources as pending for removal.
-  extensions.markPendingResourcesForRemoval(resourceId);
+  // Get pending elements for this id.
+  SVGDocumentExtensions::SVGPendingElements* pendingElements =
+      extensions.removePendingResource(resourceId);
+  if (!pendingElements || pendingElements->isEmpty())
+    return;
 
   // Rebuild pending resources for each client of a pending resource that is
   // being removed.
-  while (
-      Element* clientElement =
-          extensions.removeElementFromPendingResourcesForRemoval(resourceId)) {
-    ASSERT(clientElement->hasPendingResources());
-    if (clientElement->hasPendingResources()) {
-      // FIXME: Ideally we'd always resolve pending resources async instead of
-      // inside insertedInto and svgAttributeChanged. For now we only do it for
-      // <use> since that would stamp out DOM.
-      if (isSVGUseElement(clientElement))
-        toSVGUseElement(clientElement)->invalidateShadowTree();
-      else
-        clientElement->buildPendingResource();
-      extensions.clearHasPendingResourcesIfPossible(clientElement);
-    }
+  for (Element* clientElement : *pendingElements) {
+    DCHECK(clientElement->hasPendingResources());
+    if (!clientElement->hasPendingResources())
+      continue;
+    // TODO(fs): Ideally we'd always resolve pending resources async instead of
+    // inside insertedInto and svgAttributeChanged. For now we only do it for
+    // <use> since that would stamp out DOM.
+    if (isSVGUseElement(clientElement))
+      toSVGUseElement(clientElement)->invalidateShadowTree();
+    else
+      clientElement->buildPendingResource();
+    extensions.clearHasPendingResourcesIfPossible(clientElement);
   }
 }
 
 SVGElementRareData* SVGElement::ensureSVGRareData() {
   if (hasSVGRareData())
     return svgRareData();
 
   m_SVGRareData = new SVGElementRareData(this);
   return m_SVGRareData.get();
 }
@@ skipping 1080 matching lines @@
   visitor->trace(m_className);
   Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName() {
   DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
   return evtString;
 }
 
 }  // namespace blink