Merge 130999

Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp

Index: Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp
===================================================================
--- Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp	(revision 132822)
+++ Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp	(working copy)
@@ -188,6 +188,7 @@
     }
 
     // Characters enclosed by an <altGlyph> element, may not be registered in the GlyphPage.
+    const SimpleFontData* originalFontData = glyphData.fontData;
     if (glyphData.fontData && !glyphData.fontData->isSVGFont()) {
         if (TextRun::RenderingContext* renderingContext = run.renderingContext()) {
             RenderObject* renderObject = static_cast<SVGTextRunRenderingContext*>(renderingContext)->renderer();
@@ -239,7 +240,7 @@
 
     // 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, fontData);
+    page->setGlyphDataForCharacter(character, glyphData.glyph, originalFontData);
     fontList->setGlyphPageZero(originalGlyphPageZero);
     fontList->setGlyphPages(originalGlyphPages);
     ASSERT(fallbackGlyphData.fontData);