Move metrics list storage to LayoutSVGInlineText

third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.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 278 matching lines @@
         return false;
 
     logicalAttributes = m_layoutAttributes[m_layoutAttributesPosition];
     m_logicalMetricsListOffset = 0;
     m_logicalCharacterOffset = 0;
     return true;
 }
 
 bool SVGTextLayoutEngine::currentLogicalCharacterMetrics(SVGTextLayoutAttributes*& logicalAttributes, SVGTextMetrics& logicalMetrics)
 {
-    const Vector<SVGTextMetrics>* textMetricsValues = &logicalAttributes->textMetricsValues();
-    unsigned textMetricsSize = textMetricsValues->size();
+    const Vector<SVGTextMetrics>* metricsList = &logicalAttributes->context()->metricsList();
+    unsigned metricsListSize = metricsList->size();
     while (true) {
-        if (m_logicalMetricsListOffset == textMetricsSize) {
+        if (m_logicalMetricsListOffset == metricsListSize) {
             if (!currentLogicalCharacterAttributes(logicalAttributes))
                 return false;
 
-            textMetricsValues = &logicalAttributes->textMetricsValues();
-            textMetricsSize = textMetricsValues->size();
+            metricsList = &logicalAttributes->context()->metricsList();
+            metricsListSize = metricsList->size();
             continue;
         }
 
-        ASSERT(textMetricsSize);
-        ASSERT(m_logicalMetricsListOffset < textMetricsSize);
-        logicalMetrics = textMetricsValues->at(m_logicalMetricsListOffset);
+        ASSERT(metricsListSize);
+        ASSERT(m_logicalMetricsListOffset < metricsListSize);
+        logicalMetrics = metricsList->at(m_logicalMetricsListOffset);
         if (logicalMetrics.isEmpty() || (!logicalMetrics.width() && !logicalMetrics.height())) {
             advanceToNextLogicalCharacter(logicalMetrics);
             continue;
         }
 
         // Stop if we found the next valid logical text metrics object.
         return true;
     }
 
     ASSERT_NOT_REACHED();
@@ skipping 209 matching lines @@
     }
 
     if (!didStartTextFragment)
         return;
 
     // Close last open fragment, if needed.
     recordTextFragment(textBox);
 }
 
 } // namespace blink