Change Font::offsetForPositionForComplexText to use CachingWordShapeIterator

Source/platform/fonts/shaping/HarfBuzzShaper.h

Index: Source/platform/fonts/shaping/HarfBuzzShaper.h
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.h b/Source/platform/fonts/shaping/HarfBuzzShaper.h
index f6b1d5c2facfa26b7613892b913d7c8a3970d6d6..4b69c3c59d023b006a7dc0dec71e71e9359a52ae 100644
--- a/Source/platform/fonts/shaping/HarfBuzzShaper.h
+++ b/Source/platform/fonts/shaping/HarfBuzzShaper.h
@@ -46,6 +46,7 @@
 
 namespace blink {
 
+class CachingWordShapeIterator;
 class Font;
 class GlyphBuffer;
 class SimpleFontData;
@@ -61,13 +62,14 @@ public:
 
     float width() { return m_width; }
     FloatRect bounds() { return m_glyphBoundingBox; }
-    int offsetForPosition(float targetX);
     unsigned numCharacters() const { return m_numCharacters; }
     const HashSet<RefPtr<SimpleFontData>>* fallbackFonts() const
     {
         return &m_fallbackFonts;
     }
 
+    static int offsetForPosition(CachingWordShapeIterator&,

[eae, 2015/07/22 18:33:22]

How about changing this to take a vector of shape results just like the other
methods instead of adding a dependency on the iterator and we'd be consistent
across methods.

[kojii, 2015/07/23 05:06:12]

Makes sense, done.

+        const TextRun&, float targetX);
     static float fillGlyphBuffer(Vector<RefPtr<ShapeResult>>&,
         GlyphBuffer*, const TextRun&, unsigned from, unsigned to);
     static float fillGlyphBufferForTextEmphasis(Vector<RefPtr<ShapeResult>>&,
@@ -92,6 +94,7 @@ private:
         , m_numGlyphs(0)
         , m_direction(direction) { }
 
+    int offsetForPosition(float targetX);
     template<TextDirection>
     float fillGlyphBufferForRun(GlyphBuffer*, const RunInfo*,
         float initialAdvance, unsigned from, unsigned to, unsigned runOffset);