Don't persist the SVGTextLayoutAttributesBuilder

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
@@ skipping 34 matching lines @@
             attributes.characterDataMap().set(currentPosition + 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()
-    : m_characterCount(0)
+SVGTextLayoutAttributesBuilder::SVGTextLayoutAttributesBuilder(LayoutSVGText& textRoot)
+    : m_textRoot(textRoot)
+    , m_characterCount(0)
 {
 }
 
-void SVGTextLayoutAttributesBuilder::buildLayoutAttributes(LayoutSVGText& textRoot) const
+void SVGTextLayoutAttributesBuilder::buildLayoutAttributes()
 {
+    m_characterDataMap.clear();
+
+    if (m_textPositions.isEmpty()) {
+        m_characterCount = 0;
+        collectTextPositioningElements(m_textRoot);
+    }
+
+    if (!m_characterCount)
+        return;
+
+    buildCharacterDataMap(m_textRoot);
+
     unsigned valueListPosition = 0;
-    LayoutObject* child = textRoot.firstChild();
+    LayoutObject* child = m_textRoot.firstChild();
     while (child) {
         if (child->isSVGInlineText()) {
             updateLayoutAttributes(toLayoutSVGInlineText(*child), valueListPosition, m_characterDataMap);
         } else if (child->isSVGInline()) {
             // Visit children of text content elements.
             if (LayoutObject* inlineChild = toLayoutSVGInline(child)->firstChild()) {
                 child = inlineChild;
                 continue;
             }
         }
-        child = child->nextInPreOrderAfterChildren(&textRoot);
+        child = child->nextInPreOrderAfterChildren(&m_textRoot);
     }
 }
 
-void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextRoot(LayoutSVGText& textRoot)
-{
-    m_characterDataMap.clear();
-
-    if (m_textPositions.isEmpty()) {
-        m_characterCount = 0;
-        collectTextPositioningElements(textRoot);
-    }
-
-    if (!m_characterCount)
-        return;
-
-    buildCharacterDataMap(textRoot);
-    buildLayoutAttributes(textRoot);
-}
-
 static inline unsigned countCharactersInTextNode(const LayoutSVGInlineText& text)
 {
     unsigned numCharacters = 0;
     for (const SVGTextMetrics& metrics : text.metricsList()) {
         if (metrics.isEmpty())
             continue;
         numCharacters++;
     }
     return numCharacters;
 }
@@ skipping 142 matching lines @@
         attrLists.updateCharacterData(i, data);
     }
 }
 
 DEFINE_TRACE(SVGTextLayoutAttributesBuilder::TextPosition)
 {
     visitor->trace(element);
 }
 
 } // namespace blink