Separate advance from offset in GlypBuffer

Source/core/rendering/svg/SVGTextRunRenderingContext.cpp

 /*
  * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010-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,
@@ skipping 95 matching lines @@
     glyphOrigin.setY(svgFontData->horizontalOriginY() * scale);
 
     unsigned short resourceMode = context->textDrawingMode() == TextModeStroke ? ApplyToStrokeMode : ApplyToFillMode;
 
     FloatPoint currentPoint = point;
     for (int i = 0; i < numGlyphs; ++i) {
         Glyph glyph = glyphBuffer.glyphAt(from + i);
         if (!glyph)
             continue;
 
-        float advance = glyphBuffer.advanceAt(from + i).width();
+        float advance = glyphBuffer.advanceAt(from + i);
         SVGGlyph svgGlyph = fontElement->svgGlyphForGlyph(glyph);
         ASSERT(!svgGlyph.isPartOfLigature);
         ASSERT(svgGlyph.tableEntry == glyph);
 
         SVGGlyphElement::inheritUnspecifiedAttributes(svgGlyph, svgFontData);
 
         // FIXME: Support arbitary SVG content as glyph (currently limited to <glyph d="..."> situations).
         if (svgGlyph.pathData.isEmpty()) {
             if (isVerticalText)
                 currentPoint.move(0, advance);
@@ skipping 93 matching lines @@
     // Restore original state of the SVG Font glyph table and the current font fallback list,
     // to assure the next lookup of the same glyph won't immediately return the fallback glyph.
     page->setGlyphDataForCharacter(character, glyphData.glyph, originalFontData);
     ASSERT(fallbackGlyphData.fontData);
     return fallbackGlyphData;
 }
 
 }
 
 #endif