commit c5967f9dbaee98e8ac8302a62e015e5c595aa6e0
author Jun Fang <jun_fang@foxitsoftware.com> Fri Feb 19 08:39:22 2016 +0800
committer Jun Fang <jun_fang@foxitsoftware.com> Fri Feb 19 08:39:22 2016 +0800
tree 52aa93d7067d3407986fb57825c67de0b7f23f01
parent c599b59f77d3a620e983fd30802a414795be470a

Fix an assertion failure in CXFA_FWLTheme::Initialize()

The face names from font file stream may be different
with the ones from chromium. Pdfium should save face
names from chromium for font mapping when it works
in sandbox environment.

BUG=pdfium:392
BUG=pdfium:393
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1710753002 .

xfa/src/fgas/src/font/fx_stdfontmgr.cpp

diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
index 755d7e0..e645666 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
@@ -624,7 +624,9 @@
         CreateFontStream(pFontMapper, pSystemFontInfo, i);
     if (!pFontStream)
       continue;
-    ReportFaces(pFontStream);
+    CFX_WideString wsFaceName =
+        CFX_WideString::FromLocal(pFontMapper->GetFaceName(i).c_str());
+    RegisterFaces(pFontStream, &wsFaceName);
     pFontStream->Release();
   }
   if (m_InstalledFonts.GetSize() == 0)
@@ -643,7 +645,7 @@
       pFontSource->Release();
       continue;
     }
-    ReportFaces(pFontStream);
+    RegisterFaces(pFontStream, nullptr);
     pFontStream->Release();
     pFontSource->Release();
   }
@@ -981,8 +983,7 @@
   IFX_SystemFontInfo* pSystemFontInfo = pFontMapper->GetSystemFontInfo();
   if (!pSystemFontInfo)
     return nullptr;
-  IFX_FileRead* pFontStream =
-      CreateFontStream(pFontMapper, pSystemFontInfo, iFaceIndex);
+  IFX_FileRead* pFontStream = CreateFontStream(wsFaceName.UTF8Encode());
   if (!pFontStream)
     return nullptr;
   if (!LoadFace(pFontStream, 0)) {
@@ -1300,9 +1301,10 @@
     }
   }
 }
-void CFX_FontMgrImp::ReportFace(FXFT_Face pFace,
-                                CFX_FontDescriptors& Fonts,
-                                IFX_FileAccess* pFontAccess) {
+void CFX_FontMgrImp::RegisterFace(FXFT_Face pFace,
+                                  CFX_FontDescriptors& Fonts,
+                                  const CFX_WideString* pFaceName,
+                                  IFX_FileAccess* pFontAccess) {
   if (0 == (pFace->face_flags & FT_FACE_FLAG_SCALABLE)) {
     return;
   }
@@ -1331,8 +1333,12 @@
     FX_Free(pTable);
   }
   pFont->m_wsFamilyNames.Add(CFX_ByteString(pFace->family_name).UTF8Decode());
-  pFont->m_wsFaceName =
-      CFX_WideString::FromLocal(FXFT_Get_Postscript_Name(pFace));
+  if (pFaceName) {
+    pFont->m_wsFaceName = *pFaceName;
+  } else {
+    pFont->m_wsFaceName =
+        CFX_WideString::FromLocal(FXFT_Get_Postscript_Name(pFace));
+  }
   pFont->m_nFaceIndex = pFace->face_index;
   if (pFontAccess)
     pFont->m_pFileAccess = pFontAccess->Retain();
@@ -1340,7 +1346,8 @@
     pFont->m_pFileAccess = nullptr;
   Fonts.Add(pFont);
 }
-void CFX_FontMgrImp::ReportFaces(IFX_FileRead* pFontStream) {
+void CFX_FontMgrImp::RegisterFaces(IFX_FileRead* pFontStream,
+                                   const CFX_WideString* pFaceName) {
   int32_t index = 0;
   int32_t num_faces = 0;
   do {
@@ -1350,7 +1357,7 @@
     // All faces keep number of faces. It can be retrieved from any one face.
     if (!num_faces)
       num_faces = pFace->num_faces;
-    ReportFace(pFace, m_InstalledFonts, nullptr);
+    RegisterFace(pFace, m_InstalledFonts, pFaceName, nullptr);
     if (FXFT_Get_Face_External_Stream(pFace))
       FXFT_Clear_Face_External_Stream(pFace);
     FXFT_Done_Face(pFace);

xfa/src/fgas/src/font/fx_stdfontmgr.h

diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index 1d750e1..cdf0778 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -190,10 +190,12 @@
   FX_BOOL EnumFontsFromFiles();
 
  protected:
-  void ReportFace(FXFT_Face pFace,
-                  CFX_FontDescriptors& Fonts,
-                  IFX_FileAccess* pFontAccess);
-  void ReportFaces(IFX_FileRead* pFontStream);
+  void RegisterFace(FXFT_Face pFace,
+                    CFX_FontDescriptors& Fonts,
+                    const CFX_WideString* pFaceName,
+                    IFX_FileAccess* pFontAccess);
+  void RegisterFaces(IFX_FileRead* pFontStream,
+                     const CFX_WideString* pFaceName);
   void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names);
   void GetCharsets(FXFT_Face pFace, CFX_WordArray& Charsets);
   void GetUSBCSB(FXFT_Face pFace, FX_DWORD* USB, FX_DWORD* CSB);