Move LayoutSVGResourceContainer registration to SVGTreeScopeResources

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 64 matching lines @@
 
   LayoutSVGHiddenContainer::willBeDestroyed();
   if (m_registered)
     svgTreeScopeResourcesFromElement(element()).removeResource(m_id);
 }
 
 void LayoutSVGResourceContainer::styleDidChange(StyleDifference diff,
                                                 const ComputedStyle* oldStyle) {
   LayoutSVGHiddenContainer::styleDidChange(diff, oldStyle);
 
-  if (!m_registered) {
-    m_registered = true;
-    registerResource();
-  }
+  if (m_registered)
+    return;
+  m_registered = true;
+  svgTreeScopeResourcesFromElement(element()).updateResource(m_id, this);
 }
 
 void LayoutSVGResourceContainer::detachAllClients() {
   for (auto* client : m_clients) {
     // Unlink the resource from the client's SVGResources. (The actual
     // removal will be signaled after processing all the clients.)
     SVGResources* resources =
         SVGResourcesCache::cachedResourcesForLayoutObject(client);
     // Or else the client wouldn't be in the list in the first place.
     DCHECK(resources);
@@ skipping 10 matching lines @@
 
 void LayoutSVGResourceContainer::idChanged() {
   // Invalidate all our current clients.
   removeAllClientsFromCache();
 
   // Remove old id, that is guaranteed to be present in cache.
   SVGTreeScopeResources& treeScopeResources =
       svgTreeScopeResourcesFromElement(element());
   treeScopeResources.removeResource(m_id);
   m_id = element()->getIdAttribute();
-
-  registerResource();
+  treeScopeResources.updateResource(m_id, this);
 }
 
 void LayoutSVGResourceContainer::markAllClientsForInvalidation(
     InvalidationMode mode) {
   if (m_isInvalidating)
     return;
   SVGElementProxySet* proxySet = elementProxySet();
   if (m_clients.isEmpty() && (!proxySet || proxySet->isEmpty()))
     return;
   if (m_invalidationMask & mode)
@@ skipping 71 matching lines @@
     return;
 
   setNeedsLayoutAndFullPaintInvalidation(
       LayoutInvalidationReason::SvgResourceInvalidated, MarkContainerChain,
       layoutScope);
 
   if (everHadLayout())
     removeAllClientsFromCache();
 }
 
-void LayoutSVGResourceContainer::registerResource() {
-  SVGTreeScopeResources& treeScopeResources =
-      svgTreeScopeResourcesFromElement(element());
-  if (!treeScopeResources.hasPendingResource(m_id)) {
-    treeScopeResources.addResource(m_id, this);
-    return;
-  }
-
-  SVGTreeScopeResources::SVGPendingElements* clients(
-      treeScopeResources.removePendingResource(m_id));
-
-  // Cache us with the new id.
-  treeScopeResources.addResource(m_id, this);
-
-  // Update cached resources of pending clients.
-  for (const auto& pendingClient : *clients) {
-    DCHECK(pendingClient->hasPendingResources());
-    treeScopeResources.clearHasPendingResourcesIfPossible(pendingClient);
-    LayoutObject* layoutObject = pendingClient->layoutObject();
-    if (!layoutObject)
-      continue;
-    DCHECK(layoutObject->isSVG());
-
-    StyleDifference diff;
-    diff.setNeedsFullLayout();
-    SVGResourcesCache::clientStyleChanged(layoutObject, diff,
-                                          layoutObject->styleRef());
-    layoutObject->setNeedsLayoutAndFullPaintInvalidation(
-        LayoutInvalidationReason::SvgResourceInvalidated);
-  }
-}
-
 static inline void removeFromCacheAndInvalidateDependencies(
     LayoutObject* object,
     bool needsLayout) {
   ASSERT(object);
   if (SVGResources* resources =
           SVGResourcesCache::cachedResourcesForLayoutObject(object)) {
     resources->removeClientFromCacheAffectingObjectBounds(object);
   }
 
   if (!object->node() || !object->node()->isSVGElement())
@@ skipping 47 matching lines @@
       // This will process the rest of the ancestors.
       toLayoutSVGResourceContainer(current)->removeAllClientsFromCache();
       break;
     }
 
     current = current->parent();
   }
 }
 
 }  // namespace blink