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 330 matching lines @@
     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()) {
-      new_name.Insert(0, ' ');
-      m_InstalledTTFonts.push_back(new_name);
+      m_InstalledTTFonts[TT_NormalizeName(new_name.c_str())] = name;

[dsinclair, 2016/10/05 21:12:07]

Should this name be new_name?

[npm, 2016/10/05 21:21:47]

No. See comment below

     }
     m_pFontInfo->DeleteFont(hFont);
   }
-  m_InstalledTTFonts.push_back(name);
+  m_InstalledTTFonts[TT_NormalizeName(name.c_str())] = 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--) {

[Tom Sepez, 2016/10/05 21:17:34]

I worry about the order being significant as we move to maps. This loop would be
far simpler if we did it in the other order which makes me wonder why its done
this way.  Can there be multiple entries per normalize name?

[npm, 2016/10/05 21:21:47]

The order here is relevant in the sense that we match to the latest added. With
the map it should be the same, since I replace the entry without checking if it
has already been filled. So the map always contains the latest added.

-    CFX_ByteString norm1 = TT_NormalizeName(m_InstalledTTFonts[i].c_str());

[dsinclair, 2016/10/05 21:12:07]

Previously if TT_NormalizeName(new_name) matched norm_name we'd return new_name,
now we return name, is that intentional?

[npm, 2016/10/05 21:21:47]

On previous line 381, the index is increased by 1. So when matching
TT_NormalizeName(new_name), we would return name (at least I think that's the
intended logic here).

-    if (norm1 == norm_name)
-      break;
-  }
-  if (i < 0)
+  auto it = m_InstalledTTFonts.find(norm_name);
+  if (it == m_InstalledTTFonts.end())
     return CFX_ByteString();
-  CFX_ByteString match = m_InstalledTTFonts[i];
-  if (match[0] == ' ')
-    match = m_InstalledTTFonts[i + 1];
-  return match;
+  return it->second;
 }
 
 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;
 }