Avoid resetting the metrics-list/character offset for each text box

Source/core/layout/svg/SVGTextMetrics.h

 /*
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGTextMetrics_h
 #define SVGTextMetrics_h
 
 #include "platform/text/TextDirection.h"
+#include "wtf/Vector.h"
 
 namespace blink {
 
 class LayoutSVGInlineText;
 class TextRun;
 
 class SVGTextMetrics {
 public:
     enum MetricsType {
         SkippedSpaceMetrics
@@ skipping 15 matching lines @@
     unsigned length() const { return m_length; }
 
 private:
     SVGTextMetrics(LayoutSVGInlineText*, const TextRun&);
 
     float m_width;
     float m_height;
     unsigned m_length;
 };
 
+class SVGTextMetricsIterator {

[f(malita), 2015/05/27 01:53:49]

nit: can this be a private nested class in SVGTextLayoutEngine?

[fs, 2015/05/27 12:53:14]

I have other possible uses in mind for this (SVGTextQuery), that would make that
a poor fit... (Not that this is a great fit, I also pondered putting this in
LayoutSVGInlineText, and given pdr's feedback maybe I should.) Ended up moving
it to LayoutSVGInlineText.h

+public:
+    SVGTextMetricsIterator() { reset(nullptr); }
+
+    void reset(const Vector<SVGTextMetrics>* metricsList)

[pdr., 2015/05/27 03:11:18]

I think this can be an internal detail of the iterator.

[fs, 2015/05/27 12:53:13]

I wanted to keep the interface of the iterator fairly low-level to avoid hiding
too much semantics in it (and to keep it simple and default-inlineable.)

+    {
+        m_metricsList = metricsList;
+        m_characterOffset = 0;
+        m_metricsListOffset = 0;
+    }
+
+    void next()
+    {
+        m_characterOffset += metrics().length();
+        ++m_metricsListOffset;
+    }
+
+    const SVGTextMetrics& metrics() const { return metricsList()[m_metricsListOffset]; }

[f(malita), 2015/05/27 01:53:49]

nit: ASSERT(m_metricsList && m_metricsListOffset < m_metricsList->size());?

[fs, 2015/05/27 12:53:14]

I've sort of been relying on the RELEASE_ASSERT in operator[] here - that and a
nullptr crash... Added as requested though.

+    const Vector<SVGTextMetrics>& metricsList() const { return *m_metricsList; }
+    unsigned metricsListOffset() const { return m_metricsListOffset; }
+    unsigned characterOffset() const { return m_characterOffset; }
+
+private:
+    const Vector<SVGTextMetrics>* m_metricsList;
+    unsigned m_metricsListOffset;
+    unsigned m_characterOffset;
+};
+
 } // namespace blink
 
 #endif