Refactor <paint> URL resolution in SVGResources

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 120 matching lines @@
     case SVG_PAINTTYPE_URI:
       return true;
     default:
       break;
   }
   return false;
 }
 
 static inline LayoutSVGResourcePaintServer* paintingResourceFromSVGPaint(
     TreeScope& treeScope,
-    const SVGPaintType& paintType,
     const String& paintUri,
-    AtomicString& id,
-    bool& hasPendingResource) {
-  if (!svgPaintTypeHasURL(paintType))
-    return nullptr;
-
+    AtomicString& id) {
   id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, treeScope);
   LayoutSVGResourceContainer* container =
       treeScope.ensureSVGTreeScopedResources().resourceById(id);
-  if (!container) {
-    hasPendingResource = true;
+  if (!container || !container->isSVGPaintServer())
     return nullptr;
-  }
-
-  if (!container->isSVGPaintServer())
-    return nullptr;
-
   return toLayoutSVGResourcePaintServer(container);
 }
 
 bool SVGResources::hasResourceData() const {
   return m_clipperFilterMaskerData || m_markerData || m_fillStrokeData ||
          m_linkedResource;
 }
 
 static inline SVGResources& ensureResources(
     std::unique_ptr<SVGResources>& resources) {
@@ skipping 79 matching lines @@
       treeScopeResources.addPendingResource(markerMidId, element);
 
     const AtomicString& markerEndId = style.markerEndResource();
     if (!ensureResources(resources).setMarkerEnd(
             getLayoutSVGResourceById<LayoutSVGResourceMarker>(
                 treeScopeResources, markerEndId)))
       treeScopeResources.addPendingResource(markerEndId, element);
   }
 
   if (fillAndStrokeTags().contains(tagName)) {
-    if (style.hasFill()) {
-      bool hasPendingResource = false;
+    if (style.hasFill() && svgPaintTypeHasURL(style.fillPaintType())) {
       AtomicString id;
-      LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(
-          treeScope, style.fillPaintType(), style.fillPaintUri(), id,
-          hasPendingResource);
-      if (!ensureResources(resources).setFill(resource) && hasPendingResource)
+      LayoutSVGResourcePaintServer* resource =
+          paintingResourceFromSVGPaint(treeScope, style.fillPaintUri(), id);
+      if (!ensureResources(resources).setFill(resource))
         treeScopeResources.addPendingResource(id, element);
     }
 
-    if (style.hasStroke()) {
-      bool hasPendingResource = false;
+    if (style.hasStroke() && svgPaintTypeHasURL(style.strokePaintType())) {
       AtomicString id;
-      LayoutSVGResourcePaintServer* resource = paintingResourceFromSVGPaint(
-          treeScope, style.strokePaintType(), style.strokePaintUri(), id,
-          hasPendingResource);
-      if (!ensureResources(resources).setStroke(resource) && hasPendingResource)
+      LayoutSVGResourcePaintServer* resource =
+          paintingResourceFromSVGPaint(treeScope, style.strokePaintUri(), id);
+      if (!ensureResources(resources).setStroke(resource))
         treeScopeResources.addPendingResource(id, element);
     }
   }
 
   if (chainableResourceTags().contains(tagName)) {
     AtomicString id = targetReferenceFromResource(element);
     if (!ensureResources(resources).setLinkedResource(
             treeScopeResources.resourceById(id)))
       treeScopeResources.addPendingResource(id, element);
   }
@@ skipping 385 matching lines @@
               stroke->element());
   }
 
   if (m_linkedResource)
     fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource,
             m_linkedResource->element());
 }
 #endif
 
 }  // namespace blink