Change SVG paint server fallback for a non-existent URL

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 17 matching lines @@
 #include "core/frame/LocalFrame.h"
 #include "core/rendering/svg/RenderSVGResourceClipper.h"
 #include "core/rendering/svg/RenderSVGResourceFilter.h"
 #include "core/rendering/svg/RenderSVGResourceMasker.h"
 #include "core/rendering/svg/RenderSVGResourceSolidColor.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 
 namespace blink {
 
-static inline bool inheritColorFromParentStyle(RenderObject* object, bool applyToFill, Color& color)
-{
-    if (!object->parent() || !object->parent()->style())
-        return false;
-    const SVGRenderStyle& parentSVGStyle = object->parent()->style()->svgStyle();
-    SVGPaintType paintType = applyToFill ? parentSVGStyle.fillPaintType() : parentSVGStyle.strokePaintType();
-    if (paintType != SVG_PAINTTYPE_RGBCOLOR)
-        return false;
-    color = applyToFill ? parentSVGStyle.fillPaintColor() : parentSVGStyle.strokePaintColor();
-    return true;
-}
-
 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceMode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback)
 {
     ASSERT(object);
     ASSERT(style);
 
     hasFallback = false;
 
     // If we have no style at all, ignore it.
     const SVGRenderStyle& svgStyle = style->svgStyle();
 
@@ skipping 54 matching lines @@
         colorResource->setColor(color);
         return colorResource;
     }
 
     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;
-        // 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))
+        // The fallback is 'none'. (SVG2 say 'none' is implied when no fallback is specified.)
+        if (paintType == SVG_PAINTTYPE_URI_NONE || !hasColor)
             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) {
         colorResource->setColor(color);
@@ skipping 70 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }