Let the paint-server client compute and pass any additional transform

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 218 matching lines @@
                 GraphicsContextStateSaver stateSaver(*childPaintInfo.context, false);
                 if (!SVGRenderSupport::updateGraphicsContext(stateSaver, style(), *this, ApplyToFillMode))
                     break;
                 fillShape(childPaintInfo.context);
                 break;
             }
             case PT_STROKE:
                 if (svgStyle.hasVisibleStroke()) {
                     GraphicsContextStateSaver stateSaver(*childPaintInfo.context, false);
                     AffineTransform nonScalingTransform;
+                    const AffineTransform* additionalPaintServerTransform = 0;
 
                     if (hasNonScalingStroke()) {
-                        AffineTransform nonScalingTransform = nonScalingStrokeTransform();
+                        nonScalingTransform = nonScalingStrokeTransform();
                         if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
                             return;
+
+                        // Non-scaling stroke needs to reset the transform back to the host transform.
+                        additionalPaintServerTransform = &nonScalingTransform;
                     }
 
-                    if (!SVGRenderSupport::updateGraphicsContext(stateSaver, style(), *this, ApplyToStrokeMode))
+                    if (!SVGRenderSupport::updateGraphicsContext(stateSaver, style(), *this, ApplyToStrokeMode, additionalPaintServerTransform))
                         break;
                     strokeShape(childPaintInfo.context);
                 }
                 break;
             case PT_MARKERS:
                 if (!m_markerPositions.isEmpty())
                     drawMarkers(childPaintInfo);
                 break;
             default:
                 ASSERT_NOT_REACHED();
@@ skipping 176 matching lines @@
     ASSERT(resources);
 
     RenderSVGResourceMarker* markerStart = resources->markerStart();
 
     SVGMarkerData markerData(m_markerPositions, markerStart ? markerStart->orientType() == SVGMarkerOrientAutoStartReverse : false);
     m_path->apply(&markerData, SVGMarkerData::updateFromPathElement);
     markerData.pathIsDone();
 }
 
 }