Use glyph-ids for lookups of SVG font kerning-pairs

Source/core/rendering/svg/SVGTextRunRenderingContext.h

 /*
  * Copyright (C) Research In Motion Limited 2011. 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 26 matching lines @@
     }
 
     RenderObject* renderer() const { return m_renderer; }
 
 #if ENABLE(SVG_FONTS)
     RenderSVGResource* activePaintingResource() const { return m_activePaintingResource; }
     void setActivePaintingResource(RenderSVGResource* object) { m_activePaintingResource = object; }
 
     virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIterator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) OVERRIDE;
     virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE;
-    virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, String& glyphName) const OVERRIDE;
+    virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const OVERRIDE;
 #endif
 
 private:
     SVGTextRunRenderingContext(RenderObject* renderer)
         : m_renderer(renderer)
 #if ENABLE(SVG_FONTS)
         , m_activePaintingResource(0)
 #endif
     {
     }
@@ skipping 11 matching lines @@
 {
     // Only save the extra data if SVG Fonts are used, which depend on them.
     // FIXME: SVG Fonts won't work as segmented fonts at the moment, if that's fixed, we need to check for them as well below.
     ASSERT(font.primaryFont());
     return font.primaryFont()->isSVGFont();
 }
 
 } // namespace WebCore
 
 #endif // SVGTextRunRenderingContext_h