Merge Webkit at r58956: SVGPaintServer has been deleted upstream and replaced with SVGResourceSolidColor.cpp.

We had local modifications in the deleted file to correctly guard some Chromium/Skia includes we don't have on
Android, so move the guards into the new file. See http://trac.webkit.org/changeset/58212

See http://trac.webkit.org/changeset/588212

Change-Id: I8e7e9ea39009019f7caefd68d99942be77ea602d

2 files changed, 2 insertions, 279 deletions

diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp
index 9d34d79..792908f 100644
--- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp
+++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp
@@ -26,7 +26,7 @@
 #include "GraphicsContext.h"
 #include "SVGRenderSupport.h"
 
-#if PLATFORM(SKIA)
+#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
 #include "PlatformContextSkia.h"
 #endif
 
@@ -86,7 +86,7 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte
             context->strokePath();
     }
 
-#if PLATFORM(SKIA)
+#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
     // FIXME: Move this into the GraphicsContext
     // WebKit implicitly expects us to reset the path.
     // For example in fillAndStrokePath() of RenderPath.cpp the path is 
diff --git a/WebCore/svg/graphics/SVGPaintServer.cpp b/WebCore/svg/graphics/SVGPaintServer.cpp
deleted file mode 100644
index 5d1ebf9..0000000
--- a/WebCore/svg/graphics/SVGPaintServer.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- *               2007 Rob Buis <buis@kde.org>
- *               2008 Dirk Schulze <krit@webkit.org>
- *
- * 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
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "SVGPaintServer.h"
-
-#include "GraphicsContext.h"
-#include "NodeRenderStyle.h"
-#include "RenderObject.h"
-#include "RenderStyle.h"
-#include "SVGPaintServerSolid.h"
-#include "SVGStyledElement.h"
-#include "SVGURIReference.h"
-
-#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
-#include "PlatformContextSkia.h"
-#endif
-
-namespace WebCore {
-
-SVGPaintServer::SVGPaintServer()
-{
-}
-
-SVGPaintServer::~SVGPaintServer()
-{
-}
-
-TextStream& operator<<(TextStream& ts, const SVGPaintServer& paintServer)
-{
-    return paintServer.externalRepresentation(ts);
-}
-
-SVGPaintServer* getPaintServerById(Document* document, const AtomicString& id, const RenderObject* object)
-{
-    SVGResource* resource = getResourceById(document, id, object);
-    if (resource && resource->isPaintServer())
-        return static_cast<SVGPaintServer*>(resource);
-
-    return 0;
-}
-
-SVGPaintServerSolid* SVGPaintServer::sharedSolidPaintServer()
-{
-    static SVGPaintServerSolid* _sharedSolidPaintServer = SVGPaintServerSolid::create().releaseRef();
-    
-    return _sharedSolidPaintServer;
-}
-
-SVGPaintServer* SVGPaintServer::fillPaintServer(const RenderStyle* style, const RenderObject* item)
-{
-    if (!style->svgStyle()->hasFill())
-        return 0;
-
-    SVGPaint* fill = style->svgStyle()->fillPaint();
-        
-    SVGPaintServer* fillPaintServer = 0;
-    SVGPaint::SVGPaintType paintType = fill->paintType();
-    if (paintType == SVGPaint::SVG_PAINTTYPE_URI ||
-        paintType == SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR) {
-        AtomicString id(SVGURIReference::getTarget(fill->uri()));
-        fillPaintServer = getPaintServerById(item->document(), id, item);
-
-        SVGElement* svgElement = static_cast<SVGElement*>(item->node());
-        ASSERT(svgElement && svgElement->document() && svgElement->isStyled());
-
-        if (item->isRenderPath() && fillPaintServer)
-            fillPaintServer->addClient(static_cast<SVGStyledElement*>(svgElement));
-        else if (!fillPaintServer && paintType == SVGPaint::SVG_PAINTTYPE_URI)
-            svgElement->document()->accessSVGExtensions()->addPendingResource(id, static_cast<SVGStyledElement*>(svgElement)); 
-    }
-    if (paintType != SVGPaint::SVG_PAINTTYPE_URI && !fillPaintServer) {
-        fillPaintServer = sharedSolidPaintServer();
-        SVGPaintServerSolid* fillPaintServerSolid = static_cast<SVGPaintServerSolid*>(fillPaintServer);
-        
-        Color fillColor;
-        if (paintType == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR)
-            fillColor = style->color();
-        else
-            fillColor = fill->color();
-
-        if (style->insideLink() == InsideVisitedLink) {
-            RenderStyle* visitedStyle = style->getCachedPseudoStyle(VISITED_LINK);
-            SVGPaint* visitedFill = visitedStyle->svgStyle()->fillPaint();
-            Color visitedFillColor;
-            if (visitedFill->paintType() != SVGPaint::SVG_PAINTTYPE_URI) {
-                if (visitedFill->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR)
-                    visitedFillColor = visitedStyle->color();
-                else
-                    visitedFillColor = visitedFill->color();
-                if (visitedFillColor.isValid())
-                    fillColor = Color(visitedFillColor.red(), visitedFillColor.green(), visitedFillColor.blue(), fillColor.alpha());
-            }
-        }
-
-        fillPaintServerSolid->setColor(fillColor);
-        
-        // FIXME: Ideally invalid colors would never get set on the RenderStyle and this could turn into an ASSERT
-        if (!fillPaintServerSolid->color().isValid())
-            fillPaintServer = 0;
-    }
-    if (!fillPaintServer) {
-        // default value (black), see bug 11017
-        fillPaintServer = sharedSolidPaintServer();
-        static_cast<SVGPaintServerSolid*>(fillPaintServer)->setColor(Color::black);
-    }
-    return fillPaintServer;
-}
-
-SVGPaintServer* SVGPaintServer::strokePaintServer(const RenderStyle* style, const RenderObject* item)
-{
-    if (!style->svgStyle()->hasStroke())
-        return 0;
-
-    SVGPaint* stroke = style->svgStyle()->strokePaint();
-
-    SVGPaintServer* strokePaintServer = 0;
-    SVGPaint::SVGPaintType paintType = stroke->paintType();
-    if ((paintType == SVGPaint::SVG_PAINTTYPE_URI
-        || paintType == SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR)
-        && item->objectBoundingBox().width() != 0
-        && item->objectBoundingBox().height() != 0) {
-        AtomicString id(SVGURIReference::getTarget(stroke->uri()));
-        strokePaintServer = getPaintServerById(item->document(), id, item);
-
-        SVGElement* svgElement = static_cast<SVGElement*>(item->node());
-        ASSERT(svgElement && svgElement->document() && svgElement->isStyled());
- 
-        if (item->isRenderPath() && strokePaintServer)
-            strokePaintServer->addClient(static_cast<SVGStyledElement*>(svgElement));
-        else if (!strokePaintServer && paintType == SVGPaint::SVG_PAINTTYPE_URI)
-            svgElement->document()->accessSVGExtensions()->addPendingResource(id, static_cast<SVGStyledElement*>(svgElement)); 
-    }
-    if (paintType != SVGPaint::SVG_PAINTTYPE_URI && !strokePaintServer) {
-        strokePaintServer = sharedSolidPaintServer();
-        SVGPaintServerSolid* strokePaintServerSolid = static_cast<SVGPaintServerSolid*>(strokePaintServer);
-        
-        Color strokeColor;
-        if (paintType == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR)
-            strokeColor = style->color();
-        else
-            strokeColor = stroke->color();
-
-        if (style->insideLink() == InsideVisitedLink) {
-            RenderStyle* visitedStyle = style->getCachedPseudoStyle(VISITED_LINK);
-            SVGPaint* visitedStroke = visitedStyle->svgStyle()->strokePaint();
-            Color visitedStrokeColor;
-            if (visitedStroke->paintType() != SVGPaint::SVG_PAINTTYPE_URI) {
-                if (visitedStroke->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR)
-                    visitedStrokeColor = visitedStyle->color();
-                else
-                    visitedStrokeColor = visitedStroke->color();
-                if (visitedStrokeColor.isValid())
-                    strokeColor = Color(visitedStrokeColor.red(), visitedStrokeColor.green(), visitedStrokeColor.blue(), strokeColor.alpha());
-            }
-        }
-
-        strokePaintServerSolid->setColor(strokeColor);
-
-        // FIXME: Ideally invalid colors would never get set on the RenderStyle and this could turn into an ASSERT
-        if (!strokePaintServerSolid->color().isValid())
-            strokePaintServer = 0;
-    }
-    if (!strokePaintServer) {
-        // default value (black), see bug 11017
-        strokePaintServer = sharedSolidPaintServer();
-        static_cast<SVGPaintServerSolid*>(strokePaintServer)->setColor(Color::black);
-    }
-
-    return strokePaintServer;
-}
-
-void applyStrokeStyleToContext(GraphicsContext* context, const RenderStyle* style, const RenderObject* object)
-{
-    context->setStrokeThickness(SVGRenderStyle::cssPrimitiveToLength(object, style->svgStyle()->strokeWidth(), 1.0f));
-    context->setLineCap(style->svgStyle()->capStyle());
-    context->setLineJoin(style->svgStyle()->joinStyle());
-    if (style->svgStyle()->joinStyle() == MiterJoin)
-        context->setMiterLimit(style->svgStyle()->strokeMiterLimit());
-
-    const DashArray& dashes = dashArrayFromRenderingStyle(object->style(), object->document()->documentElement()->renderStyle());
-    float dashOffset = SVGRenderStyle::cssPrimitiveToLength(object, style->svgStyle()->strokeDashOffset(), 0.0f);
-    context->setLineDash(dashes, dashOffset);
-}
-
-bool SVGPaintServer::setup(GraphicsContext*& context, const RenderObject* object, SVGPaintTargetType type, bool isPaintingText) const
-{
-    return setup(context, object, object ? object->style() : 0, type, isPaintingText);
-}
-
-void SVGPaintServer::draw(GraphicsContext*& context, const RenderObject* path, SVGPaintTargetType type) const
-{
-    if (!setup(context, path, type))
-        return;
-
-    renderPath(context, path, type);
-    teardown(context, path, type);
-}
-
-void SVGPaintServer::renderPath(GraphicsContext*& context, const RenderObject* path, SVGPaintTargetType type) const
-{
-    const SVGRenderStyle* style = path ? path->style()->svgStyle() : 0;
-
-    if ((type & ApplyToFillTargetType) && (!style || style->hasFill()))
-        context->fillPath();
-
-    if ((type & ApplyToStrokeTargetType) && (!style || style->hasStroke()))
-        context->strokePath();
-}
-
-#if PLATFORM(SKIA) && !PLATFORM(ANDROID)
-void SVGPaintServer::teardown(GraphicsContext*& context, const RenderObject*, SVGPaintTargetType, bool) const
-{
-    // FIXME: Move this into the GraphicsContext
-    // WebKit implicitly expects us to reset the path.
-    // For example in fillAndStrokePath() of RenderPath.cpp the path is 
-    // added back to the context after filling. This is because internally it
-    // calls CGContextFillPath() which closes the path.
-    context->beginPath();
-    context->platformContext()->setFillShader(0);
-    context->platformContext()->setStrokeShader(0);
-}
-#else
-void SVGPaintServer::teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool) const
-{
-}
-#endif
-
-DashArray dashArrayFromRenderingStyle(const RenderStyle* style, RenderStyle* rootStyle)
-{
-    DashArray array;
-    
-    CSSValueList* dashes = style->svgStyle()->strokeDashArray();
-    if (dashes) {
-        CSSPrimitiveValue* dash = 0;
-        unsigned long len = dashes->length();
-        for (unsigned long i = 0; i < len; i++) {
-            dash = static_cast<CSSPrimitiveValue*>(dashes->itemWithoutBoundsCheck(i));
-            if (!dash)
-                continue;
-
-            array.append((float) dash->computeLengthFloat(const_cast<RenderStyle*>(style), rootStyle));
-        }
-    }
-
-    return array;
-}
-
-} // namespace WebCore
-
-#endif