Return AffineTransform from SVGTextFragment::buildFragmentTransform

third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 71 matching lines @@
     float scalingFactor = lineLayoutItem.scalingFactor();
     ASSERT(scalingFactor);
 
     const ComputedStyle& style = lineLayoutItem.styleRef();
 
     TextRun textRun = constructTextRun(style, fragment);
 
     // Eventually handle lengthAdjust="spacingAndGlyphs".
     // FIXME: Handle vertical text.
     if (fragment.isTransformed()) {
-        AffineTransform fragmentTransform;
-        fragment.buildFragmentTransform(fragmentTransform);
+        AffineTransform fragmentTransform = fragment.buildFragmentTransform();
         textRun.setHorizontalGlyphStretch(narrowPrecisionToFloat(fragmentTransform.xScale()));
     }
 
     return fragment.characterOffset - start() + lineLayoutItem.scaledFont().offsetForPosition(textRun, position * scalingFactor, includePartialGlyphs);
 }
 
 LayoutUnit SVGInlineTextBox::positionForOffset(int) const
 {
     // SVG doesn't use the offset <-> position selection system.
     ASSERT_NOT_REACHED();
@@ skipping 28 matching lines @@
 LayoutRect SVGInlineTextBox::localSelectionRect(int startPosition, int endPosition) const
 {
     int boxStart = start();
     startPosition = std::max(startPosition - boxStart, 0);
     endPosition = std::min(endPosition - boxStart, static_cast<int>(len()));
     if (startPosition >= endPosition)
         return LayoutRect();
 
     const ComputedStyle& style = lineLayoutItem().styleRef();
 
-    AffineTransform fragmentTransform;
     FloatRect selectionRect;
     int fragmentStartPosition = 0;
     int fragmentEndPosition = 0;
 
     unsigned textFragmentsSize = m_textFragments.size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {
         const SVGTextFragment& fragment = m_textFragments.at(i);
 
         fragmentStartPosition = startPosition;
         fragmentEndPosition = endPosition;
         if (!mapStartEndPositionsIntoFragmentCoordinates(fragment, fragmentStartPosition, fragmentEndPosition))
             continue;
 
         FloatRect fragmentRect = selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, style);
-        if (fragment.isTransformed()) {
-            fragment.buildFragmentTransform(fragmentTransform);
-            fragmentRect = fragmentTransform.mapRect(fragmentRect);
-        }
+        if (fragment.isTransformed())
+            fragmentRect = fragment.buildFragmentTransform().mapRect(fragmentRect);
 
         selectionRect.unite(fragmentRect);
     }
 
     return LayoutRect(enclosingIntRect(selectionRect));
 }
 
 void SVGInlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit, LayoutUnit) const
 {
     SVGInlineTextBoxPainter(*this).paint(paintInfo, paintOffset);
@@ skipping 56 matching lines @@
     SVGInlineTextBoxPainter(*this).paintTextMatchMarkerForeground(paintInfo, point, marker, style, font);
 }
 
 void SVGInlineTextBox::paintTextMatchMarkerBackground(const PaintInfo& paintInfo, const LayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font) const
 {
     SVGInlineTextBoxPainter(*this).paintTextMatchMarkerBackground(paintInfo, point, marker, style, font);
 }
 
 LayoutRect SVGInlineTextBox::calculateBoundaries() const
 {
-    LayoutRect textRect;
-
     LineLayoutSVGInlineText lineLayoutItem = LineLayoutSVGInlineText(this->lineLayoutItem());
-
     float scalingFactor = lineLayoutItem.scalingFactor();
     ASSERT(scalingFactor);
-
     LayoutUnit baseline = lineLayoutItem.scaledFont().fontMetrics().floatAscent() / scalingFactor;
 
-    AffineTransform fragmentTransform;
-    unsigned textFragmentsSize = m_textFragments.size();
-    for (unsigned i = 0; i < textFragmentsSize; ++i) {
-        const SVGTextFragment& fragment = m_textFragments.at(i);
+    LayoutRect textBoundingRect;
+    for (const SVGTextFragment& fragment : m_textFragments)
+        textBoundingRect.unite(LayoutRect(fragment.overflowBoundingBox(baseline)));
 
-        FloatRect fragmentRect(
-            fragment.x - fragment.glyphOverflowLeft,
-            fragment.y - baseline - fragment.glyphOverflowTop,
-            fragment.width + fragment.glyphOverflowLeft + fragment.glyphOverflowRight,
-            fragment.height + fragment.glyphOverflowTop + fragment.glyphOverflowBottom);
-        fragment.buildFragmentTransform(fragmentTransform);
-        fragmentRect = fragmentTransform.mapRect(fragmentRect);
-
-        textRect.unite(LayoutRect(fragmentRect));
-    }
-
-    return textRect;
+    return textBoundingRect;
 }
 
 bool SVGInlineTextBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit, LayoutUnit)
 {
     // FIXME: integrate with InlineTextBox::nodeAtPoint better.
     ASSERT(!isLineBreak());
 
     PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, result.hitTestRequest(), lineLayoutItem().style()->pointerEvents());
     bool isVisible = lineLayoutItem().style()->visibility() == VISIBLE;
     if (isVisible || !hitRules.requireVisible) {
         if (hitRules.canHitBoundingBox
             || (hitRules.canHitStroke && (lineLayoutItem().style()->svgStyle().hasStroke() || !hitRules.requireStroke))
             || (hitRules.canHitFill && (lineLayoutItem().style()->svgStyle().hasFill() || !hitRules.requireFill))) {
             LayoutPoint boxOrigin(x(), y());
             boxOrigin.moveBy(accumulatedOffset);
             LayoutRect rect(boxOrigin, size());
             if (locationInContainer.intersects(rect)) {
                 LineLayoutSVGInlineText lineLayoutItem = LineLayoutSVGInlineText(this->lineLayoutItem());
                 ASSERT(lineLayoutItem.scalingFactor());
                 float baseline = lineLayoutItem.scaledFont().fontMetrics().floatAscent() / lineLayoutItem.scalingFactor();
 
-                AffineTransform fragmentTransform;
-                for (const auto& fragment : m_textFragments) {
-                    FloatQuad fragmentQuad(FloatRect(fragment.x, fragment.y - baseline, fragment.width, fragment.height));
-                    if (fragment.isTransformed()) {
-                        fragment.buildFragmentTransform(fragmentTransform);
-                        fragmentQuad = fragmentTransform.mapQuad(fragmentQuad);
-                    }
-
-                    if (fragmentQuad.containsPoint(FloatPoint(locationInContainer.point()))) {
+                FloatPoint floatLocation = FloatPoint(locationInContainer.point());
+                for (const SVGTextFragment& fragment : m_textFragments) {
+                    FloatQuad fragmentQuad = fragment.boundingQuad(baseline);
+                    if (fragmentQuad.containsPoint(floatLocation)) {
                         lineLayoutItem.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
                         if (!result.addNodeToListBasedTestResult(lineLayoutItem.node(), locationInContainer, rect))
                             return true;
                     }
                 }
             }
         }
     }
     return false;
 }
 
 } // namespace blink