Simplify fallback-handling for SVG_PAINTTYPE_URI_*

Source/core/rendering/svg/RenderSVGResource.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * 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.
@@ skipping 97 matching lines @@
 
     // If the primary resource is just a color, return immediately.
     RenderSVGResourceSolidColor* colorResource = RenderSVGResource::sharedSolidPaintingResource();
     if (paintType < SVG_PAINTTYPE_URI_NONE) {
         // |paintType| will be either <current-color> or <rgb-color> here - both of which will have a color.
         ASSERT(hasColor);
         colorResource->setColor(color);
         return colorResource;
     }
 
-    // If no resources are associated with the given renderer, return the color resource.
-    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object);
-    if (!resources) {
-        if (paintType == SVG_PAINTTYPE_URI_NONE || (!hasColor && !inheritColorFromParentStyle(object, applyToFill, color)))
+    RenderSVGResource* uriResource = 0;
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object))
+        uriResource = applyToFill ? resources->fill() : resources->stroke();
+
+    // If the requested resource is not available, return the color resource or 'none'.
+    if (!uriResource) {
+        // The fallback is 'none'.
+        if (paintType == SVG_PAINTTYPE_URI_NONE)
             return 0;
-
-        colorResource->setColor(color);
-        return colorResource;
-    }
-
-    // If the requested resource is not available, return the color resource.
-    RenderSVGResource* uriResource = mode == ApplyToFillMode ? resources->fill() : resources->stroke();
-    if (!uriResource) {
+        // If there's no fallback color, attempt to use the the parents paint
+        // server if it's a simple <color>.
         if (!hasColor && !inheritColorFromParentStyle(object, applyToFill, color))
             return 0;
 
         colorResource->setColor(color);
         return colorResource;
     }
 
     // The paint server resource exists, though it may be invalid (pattern with width/height=0). Pass the fallback color to our caller
     // via sharedSolidPaintingResource so it can use the solid color painting resource, if applyResource() on the URI resource failed.
     if (hasColor) {
@@ skipping 71 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }