Clean up the getLayoutSVGResource*ById helpers

third_party/WebKit/Source/core/layout/svg/SVGResources.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 129 matching lines @@
     TreeScope& treeScope,
     const SVGPaintType& paintType,
     const String& paintUri,
     AtomicString& id,
     bool& hasPendingResource) {
   if (!svgPaintTypeHasURL(paintType))
     return nullptr;
 
   id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, treeScope);
   LayoutSVGResourceContainer* container =
-      getLayoutSVGResourceContainerById(treeScope, id);
+      treeScope.ensureSVGTreeScopedResources().resourceById(id);
   if (!container) {
     hasPendingResource = true;
     return nullptr;
   }
 
   if (!container->isSVGPaintServer())
     return nullptr;
 
   return toLayoutSVGResourcePaintServer(container);
 }
 
-static inline void registerPendingResource(
-    SVGTreeScopeResources& treeScopeResources,
-    const AtomicString& id,
-    SVGElement* element) {
-  DCHECK(element);
-  treeScopeResources.addPendingResource(id, element);
-}
-
 bool SVGResources::hasResourceData() const {
   return m_clipperFilterMaskerData || m_markerData || m_fillStrokeData ||
          m_linkedResource;
 }
 
 static inline SVGResources& ensureResources(
     std::unique_ptr<SVGResources>& resources) {
   if (!resources)
     resources = WTF::wrapUnique(new SVGResources);
 
@@ skipping 24 matching lines @@
   std::unique_ptr<SVGResources> resources;
   if (clipperFilterMaskerTags().contains(tagName)) {
     if (computedStyle.clipPath() && !object->isSVGRoot()) {
       ClipPathOperation* clipPathOperation = computedStyle.clipPath();
       if (clipPathOperation->type() == ClipPathOperation::REFERENCE) {
         const ReferenceClipPathOperation& clipPathReference =
             toReferenceClipPathOperation(*clipPathOperation);
         AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(
             clipPathReference.url(), treeScope);
         if (!ensureResources(resources).setClipper(
-                getLayoutSVGResourceById<LayoutSVGResourceClipper>(treeScope,
-                                                                   id)))
-          registerPendingResource(treeScopeResources, id, element);
+                getLayoutSVGResourceById<LayoutSVGResourceClipper>(
+                    treeScopeResources, id)))
+          treeScopeResources.addPendingResource(id, element);
       }
     }
 
     if (computedStyle.hasFilter() && !object->isSVGRoot()) {
       const FilterOperations& filterOperations = computedStyle.filter();
       if (filterOperations.size() == 1) {
         const FilterOperation& filterOperation = *filterOperations.at(0);
         if (filterOperation.type() == FilterOperation::REFERENCE) {
           const auto& referenceFilterOperation =
               toReferenceFilterOperation(filterOperation);
           AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(
               referenceFilterOperation.url(), treeScope);
           if (!ensureResources(resources).setFilter(
-                  getLayoutSVGResourceById<LayoutSVGResourceFilter>(treeScope,
-                                                                    id)))
-            registerPendingResource(treeScopeResources, id, element);
+                  getLayoutSVGResourceById<LayoutSVGResourceFilter>(
+                      treeScopeResources, id)))
+            treeScopeResources.addPendingResource(id, element);
         }
       }
     }
 
     if (style.hasMasker()) {
       AtomicString id = style.maskerResource();
       if (!ensureResources(resources).setMasker(
-              getLayoutSVGResourceById<LayoutSVGResourceMasker>(treeScope, id)))
-        registerPendingResource(treeScopeResources, id, element);
+              getLayoutSVGResourceById<LayoutSVGResourceMasker>(
+                  treeScopeResources, id)))
+        treeScopeResources.addPendingResource(id, element);
     }
   }
 
   if (style.hasMarkers() && supportsMarkers(*element)) {
     const AtomicString& markerStartId = style.markerStartResource();
     if (!ensureResources(resources).setMarkerStart(
-            getLayoutSVGResourceById<LayoutSVGResourceMarker>(treeScope,
-                                                              markerStartId)))
-      registerPendingResource(treeScopeResources, markerStartId, element);
+            getLayoutSVGResourceById<LayoutSVGResourceMarker>(
+                treeScopeResources, markerStartId)))
+      treeScopeResources.addPendingResource(markerStartId, element);
 
     const AtomicString& markerMidId = style.markerMidResource();
     if (!ensureResources(resources).setMarkerMid(
-            getLayoutSVGResourceById<LayoutSVGResourceMarker>(treeScope,
-                                                              markerMidId)))
-      registerPendingResource(treeScopeResources, markerMidId, element);
+            getLayoutSVGResourceById<LayoutSVGResourceMarker>(
+                treeScopeResources, markerMidId)))
+      treeScopeResources.addPendingResource(markerMidId, element);
 
     const AtomicString& markerEndId = style.markerEndResource();
     if (!ensureResources(resources).setMarkerEnd(
             getLayoutSVGResourceById<LayoutSVGResourceMarker>(
-                treeScope, style.markerEndResource())))
-      registerPendingResource(treeScopeResources, markerEndId, element);
+                treeScopeResources, markerEndId)))
+      treeScopeResources.addPendingResource(markerEndId, element);
   }
 
   if (fillAndStrokeTags().contains(tagName)) {
     if (style.hasFill()) {
       bool hasPendingResource = false;
       AtomicString id;
       LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(
           treeScope, style.fillPaintType(), style.fillPaintUri(), id,
           hasPendingResource);
       if (!ensureResources(resources).setFill(resource) && hasPendingResource)
-        registerPendingResource(treeScopeResources, id, element);
+        treeScopeResources.addPendingResource(id, element);
     }
 
     if (style.hasStroke()) {
       bool hasPendingResource = false;
       AtomicString id;
       LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(
           treeScope, style.strokePaintType(), style.strokePaintUri(), id,
           hasPendingResource);
       if (!ensureResources(resources).setStroke(resource) && hasPendingResource)
-        registerPendingResource(treeScopeResources, id, element);
+        treeScopeResources.addPendingResource(id, element);
     }
   }
 
   if (chainableResourceTags().contains(tagName)) {
     AtomicString id = targetReferenceFromResource(*element);
     if (!ensureResources(resources).setLinkedResource(
-            getLayoutSVGResourceContainerById(treeScope, id)))
-      registerPendingResource(treeScopeResources, id, element);
+            treeScopeResources.resourceById(id)))
+      treeScopeResources.addPendingResource(id, element);
   }
 
   return (!resources || !resources->hasResourceData()) ? nullptr
                                                        : std::move(resources);
 }
 
 void SVGResources::layoutIfNeeded() {
   if (m_clipperFilterMaskerData) {
     if (LayoutSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipper)
       clipper->layoutIfNeeded();
@@ skipping 376 matching lines @@
               stroke->element());
   }
 
   if (m_linkedResource)
     fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource,
             m_linkedResource->element());
 }
 #endif
 
 }  // namespace blink