Return AffineTransform from SVGTextFragment::buildFragmentTransform

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 87 matching lines @@
         } else {
             selectionStyle = &style;
         }
     }
 
     if (paintInfo.isRenderingClipPathAsMaskImage()) {
         hasFill = true;
         hasVisibleStroke = false;
     }
 
-    AffineTransform fragmentTransform;
     unsigned textFragmentsSize = m_svgInlineTextBox.textFragments().size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {
         const SVGTextFragment& fragment = m_svgInlineTextBox.textFragments().at(i);
 
         GraphicsContextStateSaver stateSaver(paintInfo.context, false);
         if (fragment.isTransformed()) {
-            fragment.buildFragmentTransform(fragmentTransform);
             stateSaver.save();
-            paintInfo.context.concatCTM(fragmentTransform);
+            paintInfo.context.concatCTM(fragment.buildFragmentTransform());
         }
 
         // Spec: All text decorations except line-through should be drawn before the text is filled and stroked; thus, the text is rendered on top of these decorations.
         unsigned decorations = style.textDecorationsInEffect();
         if (decorations & TextDecorationUnderline)
             paintDecoration(paintInfo, TextDecorationUnderline, fragment);
         if (decorations & TextDecorationOverline)
             paintDecoration(paintInfo, TextDecorationOverline, fragment);
 
         for (int i = 0; i < 3; i++) {
@@ skipping 37 matching lines @@
 
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(*LineLayoutPaintShim::layoutObjectFrom(m_svgInlineTextBox.lineLayoutItem()));
     if (!textShouldBePainted(textLayoutObject))
         return;
 
     const ComputedStyle& style = m_svgInlineTextBox.parent()->lineLayoutItem().styleRef();
 
     int startPosition, endPosition;
     m_svgInlineTextBox.selectionStartEnd(startPosition, endPosition);
 
-    AffineTransform fragmentTransform;
     const Vector<SVGTextFragmentWithRange> fragmentInfoList = collectFragmentsInRange(startPosition, endPosition);
     for (const SVGTextFragmentWithRange& fragmentWithRange : fragmentInfoList) {
         const SVGTextFragment& fragment = fragmentWithRange.fragment;
         GraphicsContextStateSaver stateSaver(paintInfo.context);
-        if (fragment.isTransformed()) {
-            fragment.buildFragmentTransform(fragmentTransform);
-            paintInfo.context.concatCTM(fragmentTransform);
-        }
+        if (fragment.isTransformed())
+            paintInfo.context.concatCTM(fragment.buildFragmentTransform());
 
         paintInfo.context.setFillColor(backgroundColor);
         paintInfo.context.fillRect(m_svgInlineTextBox.selectionRectForTextFragment(fragment, fragmentWithRange.startPosition, fragmentWithRange.endPosition, style), backgroundColor);
     }
 }
 
 static inline LayoutObject* findLayoutObjectDefininingTextDecoration(InlineFlowBox* parentBox)
 {
     // Lookup first layout object in parent hierarchy which has text-decoration set.
     LayoutObject* layoutObject = 0;
@@ skipping 273 matching lines @@
     fillPaint.setAntiAlias(true);
 
     SkPaint strokePaint;
     bool shouldPaintStroke  = false;
     if (setupTextPaint(paintInfo, style, ApplyToStrokeMode, strokePaint)) {
         shouldPaintStroke = true;
         strokePaint.setLooper(nullptr);
         strokePaint.setColor(textColor.rgb());
     }
 
-    AffineTransform fragmentTransform;
     for (const SVGTextFragmentWithRange& textMatchInfo : textMatchInfoList) {
         const SVGTextFragment& fragment = textMatchInfo.fragment;
         GraphicsContextStateSaver stateSaver(paintInfo.context);
-        if (fragment.isTransformed()) {
-            fragment.buildFragmentTransform(fragmentTransform);
-            paintInfo.context.concatCTM(fragmentTransform);
-        }
+        if (fragment.isTransformed())
+            paintInfo.context.concatCTM(fragment.buildFragmentTransform());
 
         TextRun textRun = m_svgInlineTextBox.constructTextRun(style, fragment);
         paintText(paintInfo, textRun, fragment, textMatchInfo.startPosition, textMatchInfo.endPosition, fillPaint);
         if (shouldPaintStroke)
             paintText(paintInfo, textRun, fragment, textMatchInfo.startPosition, textMatchInfo.endPosition, strokePaint);
     }
 }
 
 void SVGInlineTextBoxPainter::paintTextMatchMarkerBackground(const PaintInfo& paintInfo, const LayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
 {
     const Vector<SVGTextFragmentWithRange> textMatchInfoList = collectTextMatches(marker);
     if (textMatchInfoList.isEmpty())
         return;
 
     Color color = LayoutTheme::theme().platformTextSearchHighlightColor(marker->activeMatch());
-    AffineTransform fragmentTransform;
     for (const SVGTextFragmentWithRange& textMatchInfo : textMatchInfoList) {
         const SVGTextFragment& fragment = textMatchInfo.fragment;
 
         GraphicsContextStateSaver stateSaver(paintInfo.context, false);
         if (fragment.isTransformed()) {
             stateSaver.save();
-            fragment.buildFragmentTransform(fragmentTransform);
-            paintInfo.context.concatCTM(fragmentTransform);
+            paintInfo.context.concatCTM(fragment.buildFragmentTransform());
         }
         FloatRect fragmentRect = m_svgInlineTextBox.selectionRectForTextFragment(fragment, textMatchInfo.startPosition, textMatchInfo.endPosition, style);
         paintInfo.context.setFillColor(color);
         paintInfo.context.fillRect(fragmentRect);
     }
 }
 
 } // namespace blink