| Index: Source/core/svg/SVGFontData.cpp
|
| diff --git a/Source/core/svg/SVGFontData.cpp b/Source/core/svg/SVGFontData.cpp
|
| index 962e25d0876e9f2a1598edd9979065b3a5b4cce1..80804ee768ef9ba956f7624f006cb5bd2618bf37 100644
|
| --- a/Source/core/svg/SVGFontData.cpp
|
| +++ b/Source/core/svg/SVGFontData.cpp
|
| @@ -187,7 +187,7 @@ bool SVGFontData::applySVGGlyphSelection(WidthIterator& iterator, GlyphData& gly
|
| size_t altGlyphNamesSize = altGlyphNames.size();
|
| if (altGlyphNamesSize) {
|
| for (size_t index = 0; index < altGlyphNamesSize; ++index)
|
| - associatedFontElement->collectGlyphsForGlyphName(altGlyphNames[index], glyphs);
|
| + associatedFontElement->collectGlyphsForAltGlyphReference(altGlyphNames[index], glyphs);
|
|
|
| // Assign the unicodeStringLength now that its known.
|
| size_t glyphsSize = glyphs.size();
|
| @@ -198,7 +198,6 @@ bool SVGFontData::applySVGGlyphSelection(WidthIterator& iterator, GlyphData& gly
|
| // Later code will fail if we do not do this and the glyph is incompatible.
|
| if (glyphsSize) {
|
| SVGGlyph& svgGlyph = glyphs[0];
|
| - iterator.setLastGlyphName(svgGlyph.glyphName);
|
| glyphData.glyph = svgGlyph.tableEntry;
|
| advanceLength = svgGlyph.unicodeStringLength;
|
| return true;
|
| @@ -213,13 +212,11 @@ bool SVGFontData::applySVGGlyphSelection(WidthIterator& iterator, GlyphData& gly
|
| continue;
|
| if (!isCompatibleGlyph(svgGlyph, isVerticalText, language, arabicForms, currentCharacter, currentCharacter + svgGlyph.unicodeStringLength))
|
| continue;
|
| - iterator.setLastGlyphName(svgGlyph.glyphName);
|
| glyphData.glyph = svgGlyph.tableEntry;
|
| advanceLength = svgGlyph.unicodeStringLength;
|
| return true;
|
| }
|
|
|
| - iterator.setLastGlyphName(String());
|
| return false;
|
| }
|
|
|
|
|