Make RenderSVGResource::requestPaintingResource an implementation detail

Source/core/rendering/svg/SVGRenderTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
  *           (C) 2005 Rob Buis <buis@kde.org>
  *           (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 24 matching lines @@
 #include "core/rendering/svg/RenderSVGGradientStop.h"
 #include "core/rendering/svg/RenderSVGImage.h"
 #include "core/rendering/svg/RenderSVGInlineText.h"
 #include "core/rendering/svg/RenderSVGResourceClipper.h"
 #include "core/rendering/svg/RenderSVGResourceFilter.h"
 #include "core/rendering/svg/RenderSVGResourceLinearGradient.h"
 #include "core/rendering/svg/RenderSVGResourceMarker.h"
 #include "core/rendering/svg/RenderSVGResourceMasker.h"
 #include "core/rendering/svg/RenderSVGResourcePattern.h"
 #include "core/rendering/svg/RenderSVGResourceRadialGradient.h"
-#include "core/rendering/svg/RenderSVGResourceSolidColor.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/rendering/svg/RenderSVGShape.h"
 #include "core/rendering/svg/RenderSVGText.h"
 #include "core/rendering/svg/SVGInlineTextBox.h"
 #include "core/rendering/svg/SVGRootInlineBox.h"
 #include "core/svg/LinearGradientAttributes.h"
 #include "core/svg/PatternAttributes.h"
 #include "core/svg/RadialGradientAttributes.h"
 #include "core/svg/SVGCircleElement.h"
 #include "core/svg/SVGEllipseElement.h"
@@ skipping 183 matching lines @@
     }
     return ts;
 }
 
 static TextStream& operator<<(TextStream& ts, const SVGSpreadMethodType& type)
 {
     ts << SVGEnumerationToString<SVGSpreadMethodType>(type).upper();
     return ts;
 }
 
-static void writeSVGPaintingResource(TextStream& ts, RenderSVGResource* resource)
+static void writeSVGPaintingResource(TextStream& ts, const SVGPaintDescription& paintDescription)
 {
-    if (resource->resourceType() == SolidColorResourceType) {
-        ts << "[type=SOLID] [color=" << static_cast<RenderSVGResourceSolidColor*>(resource)->color() << "]";
+    ASSERT(paintDescription.isValid);
+    if (!paintDescription.resource) {
+        ts << "[type=SOLID] [color=" << paintDescription.color << "]";
         return;
     }
 
+    RenderSVGResource* resource = paintDescription.resource;
     // All other resources derive from RenderSVGResourceContainer
     RenderSVGResourceContainer* container = static_cast<RenderSVGResourceContainer*>(resource);
     SVGElement* element = container->element();
     ASSERT(element);
 
     if (resource->resourceType() == PatternResourceType)
         ts << "[type=PATTERN]";
     else if (resource->resourceType() == LinearGradientResourceType)
         ts << "[type=LINEAR-GRADIENT]";
     else if (resource->resourceType() == RadialGradientResourceType)
         ts << "[type=RADIAL-GRADIENT]";
 
     ts << " [id=\"" << element->getIdAttribute() << "\"]";
 }
 
 static void writeStyle(TextStream& ts, const RenderObject& object)
 {
     const RenderStyle* style = object.style();
     const SVGRenderStyle& svgStyle = style->svgStyle();
 
     if (!object.localTransform().isIdentity())
         writeNameValuePair(ts, "transform", object.localTransform());
     writeIfNotDefault(ts, "image rendering", style->imageRendering(), RenderStyle::initialImageRendering());
     writeIfNotDefault(ts, "opacity", style->opacity(), RenderStyle::initialOpacity());
     if (object.isSVGShape()) {
         const RenderSVGShape& shape = static_cast<const RenderSVGShape&>(object);
         ASSERT(shape.element());
 
-        bool hasFallback;
-        if (RenderSVGResource* strokePaintingResource = RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, shape, shape.style(), hasFallback)) {
+        SVGPaintDescription strokePaintDescription = RenderSVGResource::requestPaintDescription(shape, shape.style(), ApplyToStrokeMode);
+        if (strokePaintDescription.isValid) {
             TextStreamSeparator s(" ");
             ts << " [stroke={" << s;
-            writeSVGPaintingResource(ts, strokePaintingResource);
+            writeSVGPaintingResource(ts, strokePaintDescription);
 
             SVGLengthContext lengthContext(shape.element());
             double dashOffset = svgStyle.strokeDashOffset()->value(lengthContext);
             double strokeWidth = svgStyle.strokeWidth()->value(lengthContext);
             RefPtr<SVGLengthList> dashes = svgStyle.strokeDashArray();
 
             DashArray dashArray;
             SVGLengthList::ConstIterator it = dashes->begin();
             SVGLengthList::ConstIterator itEnd = dashes->end();
             for (; it != itEnd; ++it)
                 dashArray.append(it->value(lengthContext));
 
             writeIfNotDefault(ts, "opacity", svgStyle.strokeOpacity(), 1.0f);
             writeIfNotDefault(ts, "stroke width", strokeWidth, 1.0);
             writeIfNotDefault(ts, "miter limit", svgStyle.strokeMiterLimit(), 4.0f);
             writeIfNotDefault(ts, "line cap", svgStyle.capStyle(), ButtCap);
             writeIfNotDefault(ts, "line join", svgStyle.joinStyle(), MiterJoin);
             writeIfNotDefault(ts, "dash offset", dashOffset, 0.0);
             if (!dashArray.isEmpty())
                 writeNameValuePair(ts, "dash array", dashArray);
 
             ts << "}]";
         }
 
-        if (RenderSVGResource* fillPaintingResource = RenderSVGResource::requestPaintingResource(ApplyToFillMode, shape, shape.style(), hasFallback)) {
+        SVGPaintDescription fillPaintDescription = RenderSVGResource::requestPaintDescription(shape, shape.style(), ApplyToFillMode);
+        if (fillPaintDescription.isValid) {
             TextStreamSeparator s(" ");
             ts << " [fill={" << s;
-            writeSVGPaintingResource(ts, fillPaintingResource);
+            writeSVGPaintingResource(ts, fillPaintDescription);
 
             writeIfNotDefault(ts, "opacity", svgStyle.fillOpacity(), 1.0f);
             writeIfNotDefault(ts, "fill rule", svgStyle.fillRule(), RULE_NONZERO);
             ts << "}]";
         }
         writeIfNotDefault(ts, "clip rule", svgStyle.clipRule(), RULE_NONZERO);
     }
 
     writeIfNotEmpty(ts, "start marker", svgStyle.markerStartResource());
     writeIfNotEmpty(ts, "middle marker", svgStyle.markerMidResource());
@@ skipping 347 matching lines @@
             ts << " ";
             writeNameAndQuotedValue(ts, "filter", svgStyle.filterResource());
             ts << " ";
             writeStandardPrefix(ts, *filter, 0);
             ts << " " << filter->resourceBoundingBox(&renderer) << "\n";
         }
     }
 }
 
 } // namespace blink