Move metrics list storage to LayoutSVGInlineText

third_party/WebKit/Source/core/layout/svg/SVGTextQuery.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010-2012. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 220 matching lines @@
         if (startInFragment < fragmentOffset)
             break;
         ++metrics;
     }
     ASSERT(metrics <= metricsList.end());
     return metrics;
 }
 
 static float calculateGlyphRange(const QueryData* queryData, const SVGTextFragment& fragment, unsigned start, unsigned end)
 {
-    const MetricsList& metricsList = queryData->textLineLayout.layoutAttributes()->textMetricsValues();
+    const MetricsList& metricsList = queryData->textLineLayout.metricsList();
     auto metrics = findMetricsForCharacter(metricsList, fragment, start);
     auto endMetrics = findMetricsForCharacter(metricsList, fragment, end);
     float glyphRange = 0;
     for (; metrics != endMetrics; ++metrics)
         glyphRange += queryData->isVerticalText ? metrics->height() : metrics->width();
     return glyphRange;
 }
 
 // subStringLength() implementation
 struct SubStringLengthData : QueryData {
@@ skipping 191 matching lines @@
 {
     const float scalingFactor = queryData->textLineLayout.scalingFactor();
     ASSERT(scalingFactor);
     const float baseline = queryData->textLineLayout.scaledFont().getFontMetrics().floatAscent() / scalingFactor;
 
     float glyphOffsetInDirection = calculateGlyphRange(queryData, fragment, 0, startPosition);
     FloatPoint glyphPosition = logicalGlyphPositionToPhysical(queryData, fragment, glyphOffsetInDirection);
     glyphPosition.move(0, -baseline);
 
     // Use the SVGTextMetrics computed by SVGTextMetricsBuilder.
-    const MetricsList& metricsList = queryData->textLineLayout.layoutAttributes()->textMetricsValues();
+    const MetricsList& metricsList = queryData->textLineLayout.metricsList();
     auto metrics = findMetricsForCharacter(metricsList, fragment, startPosition);
 
     FloatRect extent = physicalGlyphExtents(queryData, *metrics, glyphPosition);
     if (fragment.isTransformed()) {
         AffineTransform fragmentTransform = fragment.buildFragmentTransform(SVGTextFragment::TransformIgnoringTextLength);
         extent = fragmentTransform.mapRect(extent);
     }
     return extent;
 }
 
@@ skipping 80 matching lines @@
 
     // Test the query point against the bounds of the entire fragment first.
     if (!fragment.boundingBox(baseline).contains(data->position))
         return false;
 
     AffineTransform fragmentTransform = fragment.buildFragmentTransform(SVGTextFragment::TransformIgnoringTextLength);
 
     // Iterate through the glyphs in this fragment, and check if their extents
     // contain the query point.
     MetricsList::const_iterator metrics =
-        data->textLineLayout.layoutAttributes()->textMetricsValues().begin() + fragment.metricsListOffset;
+        data->textLineLayout.metricsList().begin() + fragment.metricsListOffset;
     unsigned fragmentOffset = 0;
     float glyphOffset = 0;
     while (fragmentOffset < fragment.length) {
         FloatPoint glyphPosition = logicalGlyphPositionToPhysical(data, fragment, glyphOffset);
         glyphPosition.move(0, -baseline);
 
         FloatRect extent = fragmentTransform.mapRect(physicalGlyphExtents(data, *metrics, glyphPosition));
         if (extent.contains(data->position)) {
             // Compute the character offset of the glyph within the text node.
             unsigned offsetInBox = fragment.characterOffset - queryData->textBox->start() + fragmentOffset;
             data->offsetInTextNode = logicalOffsetInTextNode(queryData->textLineLayout, queryData->textBox, offsetInBox);
             data->hitLayoutItem = LineLayoutItem(data->textLineLayout);
             return true;
         }
         fragmentOffset += metrics->length();
         glyphOffset += data->isVerticalText ? metrics->height() : metrics->width();
         ++metrics;
     }
     return false;
 }
 
 int SVGTextQuery::characterNumberAtPosition(const FloatPoint& position) const
 {
     CharacterNumberAtPositionData data(position);
     spatialQuery(m_queryRootLayoutObject, &data, characterNumberAtPositionCallback);
     return data.characterNumberWithin(m_queryRootLayoutObject);
 }
 
 } // namespace blink