Apply the font scale factor when generating stroke geometry for <text>

third_party/WebKit/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 "core/paint/SVGInlineTextBoxPainter.h"
 
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 353 matching lines @@
         }
         break;
       case PT_STROKE:
         if (svgDecorationStyle.hasVisibleStroke()) {
           SkPaint strokePaint;
           if (!SVGPaintContext::paintForLayoutObject(
                   paintInfo, decorationStyle, *decorationLayoutObject,
                   ApplyToStrokeMode, strokePaint))
             break;
           strokePaint.setAntiAlias(true);
+          float strokeScaleFactor =
+              svgDecorationStyle.vectorEffect() == VE_NON_SCALING_STROKE
+                  ? 1 / scalingFactor
+                  : 1;
           StrokeData strokeData;
           SVGLayoutSupport::applyStrokeStyleToStrokeData(
-              strokeData, decorationStyle, *decorationLayoutObject, 1);
-          if (svgDecorationStyle.vectorEffect() == VE_NON_SCALING_STROKE)
-            strokeData.setThickness(strokeData.thickness() / scalingFactor);
+              strokeData, decorationStyle, *decorationLayoutObject,
+              strokeScaleFactor);
+          if (strokeScaleFactor != 1)
+            strokeData.setThickness(strokeData.thickness() * strokeScaleFactor);
           strokeData.setupPaint(&strokePaint);
           paintInfo.context.drawPath(path.getSkPath(), strokePaint);
         }
         break;
       case PT_MARKERS:
         break;
       default:
         ASSERT_NOT_REACHED();
     }
   }
@@ skipping 23 matching lines @@
     return false;
   paint.setAntiAlias(true);
 
   if (hasShadow(paintInfo, style)) {
     paint.setLooper(style.textShadow()->createDrawLooper(
         DrawLooperBuilder::ShadowRespectsAlpha,
         style.visitedDependentColor(CSSPropertyColor)));
   }
 
   if (resourceMode == ApplyToStrokeMode) {
+    // The stroke geometry needs be generated based on the scaled font.
+    float strokeScaleFactor =
+        style.svgStyle().vectorEffect() != VE_NON_SCALING_STROKE ? scalingFactor
+                                                                 : 1;
     StrokeData strokeData;
     SVGLayoutSupport::applyStrokeStyleToStrokeData(
-        strokeData, style, parentInlineLayoutObject(), 1);
-    if (style.svgStyle().vectorEffect() != VE_NON_SCALING_STROKE)
-      strokeData.setThickness(strokeData.thickness() * scalingFactor);
+        strokeData, style, parentInlineLayoutObject(), strokeScaleFactor);
+    if (strokeScaleFactor != 1)
+      strokeData.setThickness(strokeData.thickness() * strokeScaleFactor);
     strokeData.setupPaint(&paint);
   }
   return true;
 }
 
 void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo,
                                         TextRun& textRun,
                                         const SVGTextFragment& fragment,
                                         int startPosition,
                                         int endPosition,
@@ skipping 203 matching lines @@
     }
     FloatRect fragmentRect = m_svgInlineTextBox.selectionRectForTextFragment(
         fragment, textMatchInfo.startPosition, textMatchInfo.endPosition,
         style);
     paintInfo.context.setFillColor(color);
     paintInfo.context.fillRect(fragmentRect);
   }
 }
 
 }  // namespace blink