Use another vector for installed fonts in CFX_FontMapper

core/fxge/ge/cfx_fontmapper.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/cfx_fontmapper.h"
 
 #include <memory>
 #include <utility>
@@ skipping 329 matching lines @@
     void* hFont = m_pFontInfo->GetFont(name.c_str());
     if (!hFont) {
       int iExact;
       hFont = m_pFontInfo->MapFont(0, 0, FXFONT_DEFAULT_CHARSET, 0,
                                    name.c_str(), iExact);
       if (!hFont)
         return;
     }
 
     CFX_ByteString new_name = GetPSNameFromTT(hFont);
     if (!new_name.IsEmpty()) {

[Tom Sepez, 2016/10/06 15:58:03]

nit: no {}

-      new_name.Insert(0, ' ');
-      m_InstalledTTFonts.push_back(new_name);
+      m_LocalizedTTFonts.push_back(std::make_pair(new_name, name));
     }
     m_pFontInfo->DeleteFont(hFont);
   }
   m_InstalledTTFonts.push_back(name);
   m_LastFamily = name;
 }
 
 void CFX_FontMapper::LoadInstalledFonts() {
   if (!m_pFontInfo || m_bListLoaded)
     return;
 
   m_pFontInfo->EnumFontList(this);
   m_bListLoaded = TRUE;
 }
 
 CFX_ByteString CFX_FontMapper::MatchInstalledFonts(
     const CFX_ByteString& norm_name) {
   LoadInstalledFonts();
   int i;
   for (i = pdfium::CollectionSize<int>(m_InstalledTTFonts) - 1; i >= 0; i--) {
     CFX_ByteString norm1 = TT_NormalizeName(m_InstalledTTFonts[i].c_str());
     if (norm1 == norm_name)
       break;

[Tom Sepez, 2016/10/06 15:58:03]

nit: just return m_InstalledTTFonts[i] here?

   }
-  if (i < 0)
-    return CFX_ByteString();
-  CFX_ByteString match = m_InstalledTTFonts[i];
-  if (match[0] == ' ')
-    match = m_InstalledTTFonts[i + 1];
-  return match;
+  if (i >= 0)
+    return m_InstalledTTFonts[i];
+  for (i = pdfium::CollectionSize<int>(m_LocalizedTTFonts) - 1; i >= 0; i--) {
+    CFX_ByteString norm1 =
+        TT_NormalizeName(m_LocalizedTTFonts[i].first.c_str());
+    if (norm1 == norm_name)
+      break;

[Tom Sepez, 2016/10/06 15:58:03]

nit: same idea here.

+  }
+  if (i >= 0)
+    return m_LocalizedTTFonts[i].second;
+  return CFX_ByteString();
 }
 
 FXFT_Face CFX_FontMapper::UseInternalSubst(CFX_SubstFont* pSubstFont,
                                            int iBaseFont,
                                            int italic_angle,
                                            int weight,
                                            int picthfamily) {
   if (iBaseFont < kExternalFontIndex) {
     if (m_FoxitFaces[iBaseFont])
       return m_FoxitFaces[iBaseFont];
@@ skipping 432 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), CompareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }