Refactor SVGTextLayoutEngine::currentLogicalCharacterMetrics

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

Index: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
index cdac5757fdb34d34d0ea7a167e02fecfbf29de03..368551b92dca49a54e16a0bc3aee9c6fcd40c012 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
+++ b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
@@ -71,19 +71,19 @@ private:
     void layoutInlineTextBox(SVGInlineTextBox*);
     void layoutTextOnLineOrPath(SVGInlineTextBox*, LineLayoutSVGInlineText, const ComputedStyle&);
 
-    bool currentLogicalCharacterAttributes(SVGTextLayoutAttributes*&);
-    bool currentLogicalCharacterMetrics(SVGTextLayoutAttributes*&, SVGTextMetrics&);
+    const SVGTextLayoutAttributes* nextLogicalAttributes();
+    const SVGTextLayoutAttributes* currentLogicalCharacterMetrics(SVGTextMetrics&);
     void advanceToNextLogicalCharacter(const SVGTextMetrics&);
 
-private:
+    // Logical iteration state.
     Vector<SVGTextLayoutAttributes*>& m_layoutAttributes;
+    unsigned m_layoutAttributesPosition;
+    unsigned m_logicalCharacterOffset;
+    unsigned m_logicalMetricsListOffset;
 
     Vector<SVGInlineTextBox*> m_lineLayoutBoxes;
 
     SVGTextFragment m_currentTextFragment;
-    unsigned m_layoutAttributesPosition;
-    unsigned m_logicalCharacterOffset;
-    unsigned m_logicalMetricsListOffset;
     SVGInlineTextMetricsIterator m_visualMetricsIterator;
     FloatPoint m_textPosition;
     bool m_isVerticalText;