commit 5f1d0f61ea182829826d9d76cb85346d3e23305d
author halcanary <halcanary@google.com> Tue Sep 13 08:08:38 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 13 08:08:38 2016 -0700
tree 69e720980b78a12b26593c6dc0536c21b885486a
parent 5718b2df4c4fbe61b437ed74a427cbb5e3e17118

SkPDF: SkTypeface_FreeType ToUnicode table improvement.

Currently the SkTypeface_FreeType::onGetAdvancedTypefaceMetrics
synthesized glyph to Unicode mapping returns the Unicode point
of the last character to map to the glyph. In practice it is
better to guess the first character to map to the glyph instead.

BUG=359065
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2329953003

Review-Url: https://codereview.chromium.org/2329953003

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 6681c9c..84a74af 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -447,7 +447,10 @@
     SkUnichar charCode = FT_Get_First_Char(face, &glyphIndex);
     while (glyphIndex) {
         SkASSERT(glyphIndex < SkToUInt(numGlyphs));
-        (*glyphToUnicode)[glyphIndex] = charCode;
+        // Use the first character that maps to this glyphID. https://crbug.com/359065
+        if (0 == (*glyphToUnicode)[glyphIndex]) {
+            (*glyphToUnicode)[glyphIndex] = charCode;
+        }
         charCode = FT_Get_Next_Char(face, charCode, &glyphIndex);
     }
 }