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

Source/core/paint/SVGInlineTextBoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGInlineTextBoxPainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/RenderedDocumentMarker.h"
 #include "core/editing/Editor.h"
@@ skipping 255 matching lines @@
         case PT_FILL:
             if (svgDecorationStyle.hasFill()) {
                 GraphicsContextStateSaver stateSaver(*context, false);
                 if (!SVGRenderSupport::updateGraphicsContext(stateSaver, decorationStyle, *decorationRenderer, ApplyToFillMode))
                     break;
                 context->fillPath(path);
             }
             break;
         case PT_STROKE:
             if (svgDecorationStyle.hasVisibleStroke()) {
+                // FIXME: Non-scaling stroke is not applied here.

[fs, 2014/10/15 15:42:11]

This FIXME and the one below just document pre-existing breakage. (The
non-scaling-stroke adjustments were/are gated on being shapes. Possibly easier
to fix now with this change though.)

                 GraphicsContextStateSaver stateSaver(*context, false);
                 if (!SVGRenderSupport::updateGraphicsContext(stateSaver, decorationStyle, *decorationRenderer, ApplyToStrokeMode))
                     break;
                 context->strokePath(path);
             }
             break;
         case PT_MARKERS:
             break;
         default:
             ASSERT_NOT_REACHED();
@@ skipping 11 matching lines @@
     ASSERT(scalingFactor);
 
     const Font& scaledFont = textRenderer.scaledFont();
     const ShadowList* shadowList = style->textShadow();
 
     // Text shadows are disabled when printing. http://crbug.com/258321
     bool hasShadow = shadowList && !context->printing();
 
     FloatPoint textOrigin(fragment.x, fragment.y);
     FloatSize textSize(fragment.width, fragment.height);
+    AffineTransform paintServerTransform;
+    const AffineTransform* additionalPaintServerTransform = 0;
 
     GraphicsContextStateSaver stateSaver(*context, false);
     if (scalingFactor != 1) {
         textOrigin.scale(scalingFactor, scalingFactor);
         textSize.scale(scalingFactor);
         stateSaver.save();
         context->scale(1 / scalingFactor, 1 / scalingFactor);
+        // Adjust the paint-server coordinate space.
+        paintServerTransform.scale(scalingFactor);
+        additionalPaintServerTransform = &paintServerTransform;
     }
 
-    if (!SVGRenderSupport::updateGraphicsContext(stateSaver, style, m_svgInlineTextBox.parent()->renderer(), resourceMode | ApplyToTextMode))
+    // FIXME: Non-scaling stroke is not applied here.
+
+    if (!SVGRenderSupport::updateGraphicsContext(stateSaver, style, m_svgInlineTextBox.parent()->renderer(), resourceMode, additionalPaintServerTransform))
         return;
 
     if (hasShadow) {
         stateSaver.saveIfNeeded();
         context->setDrawLooper(shadowList->createDrawLooper(DrawLooperBuilder::ShadowRespectsAlpha));
     }
 
     context->setTextDrawingMode(resourceMode == ApplyToFillMode ? TextModeFill : TextModeStroke);
 
     if (scalingFactor != 1 && resourceMode == ApplyToStrokeMode)
@@ skipping 104 matching lines @@
 
             fragmentRect = fragmentTransform.mapRect(fragmentRect);
             markerRect.unite(fragmentRect);
         }
     }
 
     toRenderedDocumentMarker(marker)->setRenderedRect(textRenderer.localToAbsoluteQuad(markerRect).enclosingBoundingBox());
 }
 
 } // namespace blink