Move metrics list storage to LayoutSVGInlineText

third_party/WebKit/Source/core/layout/svg/SVGTextMetricsBuilder.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 208 matching lines @@
 
     bool lastCharacterWasWhiteSpace;
     unsigned valueListPosition;
 };
 
 // Struct for updating SVGTextLayoutAttributes. If an SVGCharacterDataMap is
 // available, the attribute's character data map will also be updated.
 // TreeWalkTextState should be used to maintain the value list position which
 // indexes into the SVGCharacterDataMap of all characters.
 struct UpdateAttributes {
-    UpdateAttributes(SVGTextLayoutAttributes& textAttributes, const SVGCharacterDataMap* allCharacters)
-        : attributes(textAttributes)
+    UpdateAttributes(
+        SVGTextLayoutAttributes& textAttributes,
+        Vector<SVGTextMetrics>& metricsList,
+        const SVGCharacterDataMap* allCharacters)
+        : metricsList(metricsList)
+        , attributes(textAttributes)
         , allCharactersMap(allCharacters) { }
 
     void clearExistingAttributes()
     {
+        metricsList.clear();
+
         if (allCharactersMap)
             attributes.clear();
-        else
-            attributes.textMetricsValues().clear();
     }
 
     void addMetrics(SVGTextMetrics metrics)
     {
-        attributes.textMetricsValues().append(metrics);
+        metricsList.append(metrics);
     }
 
     void updateCharacterDataMap(unsigned valueListPosition, unsigned currentTextPosition)
     {
         if (!allCharactersMap)
             return;
         const SVGCharacterDataMap::const_iterator it = allCharactersMap->find(valueListPosition);
         if (it != allCharactersMap->end())
             attributes.characterDataMap().set(currentTextPosition, it->value);
     }
 
+    Vector<SVGTextMetrics>& metricsList;
     SVGTextLayoutAttributes& attributes;
     const SVGCharacterDataMap* allCharactersMap;
 };
 
 void walkInlineText(LayoutSVGInlineText* text, TreeWalkTextState& textState, UpdateAttributes* attributesToUpdate = nullptr)
 {
     if (attributesToUpdate)
         attributesToUpdate->clearExistingAttributes();
 
     if (!text->textLength())
@@ skipping 31 matching lines @@
 
 void walkTree(LayoutSVGText* start, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap* allCharactersMap = nullptr)
 {
     TreeWalkTextState textState;
     LayoutObject* child = start->firstChild();
     while (child) {
         if (child->isSVGInlineText()) {
             LayoutSVGInlineText* text = toLayoutSVGInlineText(child);
             OwnPtr<UpdateAttributes> attributesToUpdate = nullptr;
             if (!stopAtText || stopAtText == text)
-                attributesToUpdate = adoptPtr(new UpdateAttributes(*text->layoutAttributes(), allCharactersMap));
+                attributesToUpdate = adoptPtr(new UpdateAttributes(*text->layoutAttributes(), text->metricsList(), allCharactersMap));
             walkInlineText(text, textState, attributesToUpdate.get());
             if (stopAtText == text)
                 return;
         } else if (child->isSVGInline()) {
             // Visit children of text content elements.
             if (LayoutObject* inlineChild = toLayoutSVGInline(child)->firstChild()) {
                 child = inlineChild;
                 continue;
             }
         }
@@ skipping 10 matching lines @@
         walkTree(textRoot, text);
 }
 
 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textRoot, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap& allCharactersMap)
 {
     ASSERT(textRoot);
     walkTree(textRoot, stopAtText, &allCharactersMap);
 }
 
 } // namespace blink