Introduce SVGPaintServer

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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
-
 #include "core/rendering/svg/RenderSVGResource.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/SVGRenderSupport.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
-#include "platform/graphics/GraphicsContext.h"
 
 namespace blink {
 
-bool RenderSVGResource::applyResource(RenderObject*, RenderStyle*, GraphicsContext*, RenderSVGResourceModeFlags)
+bool RenderSVGResource::preparePaintServer(RenderObject*, RenderStyle*, RenderSVGResourceModeFlags, SVGPaintServer&)
 {
     ASSERT_NOT_REACHED();
     return false;
 }
 
 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();
 
-    bool isRenderingMask = SVGRenderSupport::isRenderingClipPathAsMaskImage(*object);
-
     // If we have no fill/stroke, return 0.
     if (mode == ApplyToFillMode) {
-        // When rendering the mask for a RenderSVGResourceClipper, always use the initial fill paint server, and ignore stroke.
-        if (isRenderingMask) {
-            RenderSVGResourceSolidColor* colorResource = RenderSVGResource::sharedSolidPaintingResource();
-            colorResource->setColor(SVGRenderStyle::initialFillPaintColor());
-            return colorResource;
-        }
-
         if (!svgStyle.hasFill())
             return 0;
     } else {
-        if (!svgStyle.hasStroke() || isRenderingMask)
+        if (!svgStyle.hasStroke())
             return 0;
     }
 
     bool applyToFill = mode == ApplyToFillMode;
     SVGPaintType paintType = applyToFill ? svgStyle.fillPaintType() : svgStyle.strokePaintType();
     ASSERT(paintType != SVG_PAINTTYPE_NONE);
 
     Color color;
     bool hasColor = false;
     switch (paintType) {
@@ skipping 44 matching lines @@
 
     // 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);
         hasFallback = true;
     }
     return uriResource;
 }
 
-void RenderSVGResource::updateGraphicsContext(GraphicsContext* context, const RenderStyle* style, const RenderObject& renderer, unsigned resourceModeFlags)
-{
-    ASSERT(context);
-    ASSERT(style);
-
-    RenderSVGResourceMode resourceMode = static_cast<RenderSVGResourceMode>(resourceModeFlags & (ApplyToFillMode | ApplyToStrokeMode));
-    ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
-
-    if (SVGRenderSupport::isRenderingClipPathAsMaskImage(renderer)) {
-        // When rendering the mask for a RenderSVGResourceClipper, the stroke code path is never hit.
-        ASSERT(resourceMode == ApplyToFillMode);
-        context->setAlphaAsFloat(1);
-        return;
-    }
-
-    const SVGRenderStyle& svgStyle = style->svgStyle();
-
-    if (resourceMode == ApplyToFillMode) {
-        context->setAlphaAsFloat(svgStyle.fillOpacity());
-        context->setFillRule(svgStyle.fillRule());
-    } else {
-        context->setAlphaAsFloat(svgStyle.strokeOpacity());
-        SVGRenderSupport::applyStrokeStyleToContext(context, style, &renderer);
-    }
-}
-
 RenderSVGResourceSolidColor* RenderSVGResource::sharedSolidPaintingResource()
 {
     static RenderSVGResourceSolidColor* s_sharedSolidPaintingResource = 0;
     if (!s_sharedSolidPaintingResource)
         s_sharedSolidPaintingResource = new RenderSVGResourceSolidColor;
     return s_sharedSolidPaintingResource;
 }
 
 static inline void removeFromCacheAndInvalidateDependencies(RenderObject* object, bool needsLayout)
 {
@@ skipping 55 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }