Use SVGInlineTextMetricsIterator in updateLayoutAttributes

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

 /*
  * Copyright (C) Research In Motion Limited 2010-2011. 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/layout/svg/SVGTextLayoutAttributesBuilder.h"
 
+#include "core/layout/api/LineLayoutSVGInlineText.h"
 #include "core/layout/svg/LayoutSVGInline.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
 #include "core/layout/svg/LayoutSVGText.h"
 #include "core/svg/SVGTextPositioningElement.h"
 
 namespace blink {
 
 namespace {
 
 void updateLayoutAttributes(LayoutSVGInlineText& text, unsigned& valueListPosition, const SVGCharacterDataMap& allCharactersMap)
 {
     SVGCharacterDataMap& characterDataMap = text.characterDataMap();
     characterDataMap.clear();
 
-    const Vector<SVGTextMetrics>& metricsList = text.metricsList();
-    auto metricsEnd = metricsList.end();
-    unsigned currentPosition = 0;
-    for (auto metrics = metricsList.begin(); metrics != metricsEnd; currentPosition += metrics->length(), ++metrics) {
-        if (metrics->isEmpty())
+    LineLayoutSVGInlineText textLineLayout(&text);
+    for (SVGInlineTextMetricsIterator iterator(textLineLayout); !iterator.isAtEnd(); iterator.next()) {
+        if (iterator.metrics().isEmpty())
             continue;
 
         auto it = allCharactersMap.find(valueListPosition + 1);
         if (it != allCharactersMap.end())
-            characterDataMap.set(currentPosition + 1, it->value);
+            characterDataMap.set(iterator.characterOffset() + 1, it->value);
 
         // Increase the position in the value/attribute list with one for each
         // "character unit" (that will be displayed.)
         valueListPosition++;
     }
 }
 
 } // namespace
 
 SVGTextLayoutAttributesBuilder::SVGTextLayoutAttributesBuilder(LayoutSVGText& textRoot)
@@ skipping 177 matching lines @@
         attrLists.updateCharacterData(i, data);
     }
 }
 
 DEFINE_TRACE(SVGTextLayoutAttributesBuilder::TextPosition)
 {
     visitor->trace(element);
 }
 
 } // namespace blink