Support 'paint-order' from SVG2.

Source/core/rendering/svg/RenderSVGShape.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * Copyright (C) 2011 University of Szeged
@@ skipping 230 matching lines @@
             strokePaintingResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
         else if (fallbackColor.isValid()) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
             fallbackResource->setColor(fallbackColor);
             if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode))
                 fallbackResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
         }
     }
 }
 
-void RenderSVGShape::fillAndStrokeShape(GraphicsContext* context)
-{
-    RenderStyle* style = this->style();
-
-    fillShape(style, context);
-
-    if (!style->svgStyle()->hasVisibleStroke())
-        return;
-
-    GraphicsContextStateSaver stateSaver(*context, false);
-
-    if (hasNonScalingStroke()) {
-        AffineTransform nonScalingTransform = nonScalingStrokeTransform();
-        if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
-            return;
-    }
-
-    strokeShape(style, context);
-}
-
 void RenderSVGShape::paint(PaintInfo& paintInfo, const LayoutPoint&)
 {
     if (paintInfo.context->paintingDisabled() || style()->visibility() == HIDDEN || isEmpty())
         return;
     FloatRect boundingBox = repaintRectInLocalCoordinates();
     if (!SVGRenderSupport::paintInfoIntersectsRepaintRect(boundingBox, m_localTransform, paintInfo))
         return;
 
     PaintInfo childPaintInfo(paintInfo);
     bool drawsOutline = style()->outlineWidth() && (childPaintInfo.phase == PaintPhaseOutline || childPaintInfo.phase == PaintPhaseSelfOutline);
     if (drawsOutline || childPaintInfo.phase == PaintPhaseForeground) {
         GraphicsContextStateSaver stateSaver(*childPaintInfo.context);
         childPaintInfo.applyTransform(m_localTransform);
 
         if (childPaintInfo.phase == PaintPhaseForeground) {
             SVGRenderingContext renderingContext(this, childPaintInfo);
 
             if (renderingContext.isRenderingPrepared()) {
                 const SVGRenderStyle* svgStyle = style()->svgStyle();
                 if (svgStyle->shapeRendering() == SR_CRISPEDGES)
                     childPaintInfo.context->setShouldAntialias(false);
 
-                fillAndStrokeShape(childPaintInfo.context);
-                if (!m_markerPositions.isEmpty())
-                    drawMarkers(childPaintInfo);
+                for (int i = 0; i < 3; i++) {
+                    switch(svgStyle->paintOrder(i)) {
+                        case PO_FILL:
+                            fillShape(this->style(), childPaintInfo.context);
+                            break;
+                        case PO_STROKE:
+                            if (svgStyle->hasVisibleStroke()) {
+                                GraphicsContextStateSaver stateSaver(*childPaintInfo.context, false);
+                                AffineTransform nonScalingTransform;
+
+                                if (hasNonScalingStroke()) {
+                                    AffineTransform nonScalingTransform = nonScalingStrokeTransform();
+                                    if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
+                                        return;
+                                }
+
+                                strokeShape(this->style(), childPaintInfo.context);
+                            }
+                            break;
+                        case PO_MARKERS:
+                            if (!m_markerPositions.isEmpty())
+                                drawMarkers(childPaintInfo);
+                            break;
+                        default:
+                            ASSERT_NOT_REACHED();
+                            break;
+                    }
+                }
             }
         }
 
         if (drawsOutline)
             paintOutline(childPaintInfo, IntRect(boundingBox));
     }
 }
 
 // This method is called from inside paintOutline() since we call paintOutline()
 // while transformed to our coord system, return local coords
@@ skipping 155 matching lines @@
     ASSERT(m_path);
 
     SVGMarkerData markerData(m_markerPositions);
     m_path->apply(&markerData, SVGMarkerData::updateFromPathElement);
     markerData.pathIsDone();
 }
 
 }
 
 #endif // ENABLE(SVG)