Make emphasis mark glyph data retrieval independent of code path

third_party/WebKit/Source/platform/fonts/Font.cpp

Index: third_party/WebKit/Source/platform/fonts/Font.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/Font.cpp b/third_party/WebKit/Source/platform/fonts/Font.cpp
index 834c9960fb13c93b9da95d68f91b900eb6f3d23e..4a39f1d9d83b39bf25b0184fa9e611fa80ce7c42 100644
--- a/third_party/WebKit/Source/platform/fonts/Font.cpp
+++ b/third_party/WebKit/Source/platform/fonts/Font.cpp
@@ -658,31 +658,23 @@ GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpa
     return data;
 }
 
-// FIXME: This function may not work if the emphasis mark uses a complex script, but none of the
-// standard emphasis marks do so.
 bool Font::getEmphasisMarkGlyphData(const AtomicString& mark, GlyphData& glyphData) const
 {
     if (mark.isEmpty())
         return false;
 
-    UChar32 character = mark[0];
-
-    if (U16_IS_SURROGATE(character)) {
-        if (!U16_IS_SURROGATE_LEAD(character))
-            return false;
-
-        if (mark.length() < 2)
-            return false;
+    TextRun emphasisMarkRun(mark, mark.length());
+    TextRunPaintInfo emphasisPaintInfo(emphasisMarkRun);
+    GlyphBuffer glyphBuffer;
+    buildGlyphBuffer(emphasisPaintInfo, glyphBuffer);
 
-        UChar low = mark[1];
-        if (!U16_IS_TRAIL(low))
-            return false;
+    if (glyphBuffer.isEmpty())
+        return false;
 
-        character = U16_GET_SUPPLEMENTARY(character, low);
-    }
+    ASSERT(glyphBuffer.fontDataAt(0));
+    glyphData.fontData = glyphBuffer.fontDataAt(0)->emphasisMarkFontData(m_fontDescription).get();
+    glyphData.glyph = glyphBuffer.glyphAt(0);
 
-    bool normalizeSpace = false;
-    glyphData = glyphDataForCharacter(character, false, normalizeSpace, EmphasisMarkVariant);
     return true;
 }