| Index: Source/core/rendering/svg/SVGTextMetricsBuilder.cpp | 
| diff --git a/Source/core/rendering/svg/SVGTextMetricsBuilder.cpp b/Source/core/rendering/svg/SVGTextMetricsBuilder.cpp | 
| index 55dc71f7ab71e0af722c755874900b889f7cfeea..65ceb8ca851edaf50b7ccf8fedc4d087cd89cfec 100644 | 
| --- a/Source/core/rendering/svg/SVGTextMetricsBuilder.cpp | 
| +++ b/Source/core/rendering/svg/SVGTextMetricsBuilder.cpp | 
| @@ -67,11 +67,8 @@ void SVGTextMetricsBuilder::advanceSimpleText() | 
| float currentWidth = m_simpleWidthIterator->runWidthSoFar() - m_totalWidth; | 
| m_totalWidth = m_simpleWidthIterator->runWidthSoFar(); | 
|  | 
| -#if ENABLE(SVG_FONTS) | 
| -    m_currentMetrics = SVGTextMetrics(m_text, m_textPosition, metricsLength, currentWidth, m_simpleWidthIterator->lastGlyphName()); | 
| -#else | 
| -    m_currentMetrics = SVGTextMetrics(m_text, m_textPosition, metricsLength, currentWidth, emptyString()); | 
| -#endif | 
| +    Glyph glyphId = glyphBuffer.glyphAt(0); | 
| +    m_currentMetrics = SVGTextMetrics(m_text, m_textPosition, metricsLength, currentWidth, glyphId); | 
| } | 
|  | 
| void SVGTextMetricsBuilder::advanceComplexText() | 
|  |