Move metrics list storage to LayoutSVGInlineText

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

Index: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
index 6ea9250307c4ba2e4420039fdb1d8cecc3b9969d..bbff8d05fffd43fb6a7a89e2e1935fa5cadf9c45 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
@@ -296,21 +296,21 @@ bool SVGTextLayoutEngine::currentLogicalCharacterAttributes(SVGTextLayoutAttribu
 
 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;