Merge to XFA: Fix rendering with built-in CID fonts

core/src/fxge/ge/fx_ge_fontmap.cpp

 // Copyright 2014 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 <limits>
 
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
@@ skipping 1034 matching lines @@
       }
     }
   } else {
     italic_angle = 0;
     weight =
         nStyle & FX_FONT_STYLE_BoldBold
             ? 900
             : (nStyle & FX_FONT_STYLE_Bold ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL);
   }
   if (!match.IsEmpty() || iBaseFont < 12) {
-    pSubstFont->m_SubstFlags |= FXFONT_SUBST_EXACT;
     if (!match.IsEmpty()) {
       family = match;
     }
     if (iBaseFont < 12) {
       if (nStyle && !(iBaseFont % 4)) {
         if ((nStyle & 0x3) == 1) {
           iBaseFont += 1;
         }
         if ((nStyle & 0x3) == 2) {
           iBaseFont += 3;
@@ skipping 525 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;
 }