Index: Source/core/rendering/svg/SVGTextRunRenderingContext.cpp |
diff --git a/Source/core/rendering/svg/SVGTextRunRenderingContext.cpp b/Source/core/rendering/svg/SVGTextRunRenderingContext.cpp |
index c48c91e2486eb3ed6843fd5a27cec45faa9027ed..2906739ad84cdd5b46a75d1248229d40196c55fa 100644 |
--- a/Source/core/rendering/svg/SVGTextRunRenderingContext.cpp |
+++ b/Source/core/rendering/svg/SVGTextRunRenderingContext.cpp |
@@ -73,12 +73,12 @@ static inline RenderSVGResource* activePaintingResourceFromRun(const TextRun& ru |
return 0; |
} |
-float SVGTextRunRenderingContext::floatWidthUsingSVGFont(const Font& font, const TextRun& run, int& charsConsumed, String& glyphName) const |
+float SVGTextRunRenderingContext::floatWidthUsingSVGFont(const Font& font, const TextRun& run, int& charsConsumed, Glyph& glyphId) const |
{ |
WidthIterator it(&font, run); |
GlyphBuffer glyphBuffer; |
charsConsumed += it.advance(run.length(), &glyphBuffer); |
- glyphName = it.lastGlyphName(); |
+ glyphId = !glyphBuffer.isEmpty() ? glyphBuffer.glyphAt(0) : 0; |
return it.runWidthSoFar(); |
} |