Merge to XFA: Make CFX_FontMgr member variables private. (try 2)

xfa/src/fgas/src/font/fx_stdfontmgr.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 "../fgas_base.h"
 #include "fx_stdfontmgr.h"
 #include "fx_fontutils.h"
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
@@ skipping 593 matching lines @@
   delete pFontMgr;
   return NULL;
 }
 CFX_FontMgrImp::CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum,
                                IFX_FontMgrDelegate* pDelegate,
                                void* pUserData)
     : m_pFontSource(pFontEnum),
       m_pDelegate(pDelegate),
       m_pUserData(pUserData) {}
 FX_BOOL CFX_FontMgrImp::EnumFonts() {
-  FXFT_Library& library = CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary;

[Lei Zhang, 2015/10/21 00:51:24]

|library| is not used here - initialization not needed?

[Tom Sepez, 2015/10/21 20:03:55]

May still need it in case any of our callees expect to see m_FTLibrary.

[Lei Zhang, 2015/10/21 23:29:02]

I'll just call it anyway.

-  if (library == NULL) {
-    FXFT_Init_FreeType(&library);
-  }
-  if (library == NULL) {
-    return FALSE;
-  }
   FXFT_Face pFace = NULL;
   FX_POSITION pos = m_pFontSource->GetStartPosition();
   IFX_FileAccess* pFontSource = NULL;
   IFX_FileRead* pFontStream = NULL;
   while (pos) {
     pFontSource = m_pFontSource->GetNext(pos);
     pFontStream = pFontSource->CreateFileStream(FX_FILEMODE_ReadOnly);
     if (NULL == pFontStream) {
       pFontSource->Release();
       continue;
@@ skipping 365 matching lines @@
   }
   IFX_FileRead* pFile = (IFX_FileRead*)stream->descriptor.pointer;
   int res = pFile->ReadBlock(buffer, offset, count);
   if (res) {
     return count;
   }
   return 0;
 }
 void _ftStreamClose(FXFT_Stream stream) {}
 };
+
 FXFT_Face CFX_FontMgrImp::LoadFace(IFX_FileRead* pFontStream,
                                    int32_t iFaceIndex) {
-  FXFT_Library& library = CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary;
-  FXFT_Open_Args ftArgs;
+  if (!pFontStream)
+    return nullptr;
+
+  CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
+  pFontMgr->InitFTLibrary();
+  FXFT_Library library = pFontMgr->GetFTLibrary();
+  if (!library)
+    return nullptr;
+
   FXFT_Stream ftStream = FX_Alloc(FXFT_StreamRec, 1);
-  FXFT_Face pFace = NULL;
-  if (library == NULL) {
-    FXFT_Init_FreeType(&library);
-  }
-  if (library == NULL) {
-    goto BadRet;
-  }
-  FXSYS_memset(&ftArgs, 0, sizeof(FXFT_Open_Args));
-  if (NULL == ftStream) {
-    goto BadRet;
-  }
   FXSYS_memset(ftStream, 0, sizeof(FXFT_StreamRec));
-  if (NULL == pFontStream) {
-    goto BadRet;
-  }
   ftStream->base = NULL;
   ftStream->descriptor.pointer = pFontStream;
   ftStream->pos = 0;
   ftStream->size = (unsigned long)pFontStream->GetSize();
   ftStream->read = _ftStreamRead;
   ftStream->close = _ftStreamClose;
+
+  FXFT_Open_Args ftArgs;
+  FXSYS_memset(&ftArgs, 0, sizeof(FXFT_Open_Args));
   ftArgs.flags |= FT_OPEN_STREAM;
   ftArgs.stream = ftStream;
-  if (0 != FXFT_Open_Face(library, &ftArgs, iFaceIndex, &pFace)) {
-    goto BadRet;
+
+  FXFT_Face pFace = NULL;
+  if (FXFT_Open_Face(library, &ftArgs, iFaceIndex, &pFace)) {
+    FX_Free(ftStream);

[Lei Zhang, 2015/10/21 00:51:24]

Not sure if |ftStream| needs to be freed if FXFT_Open_Face() returns 0, AKA
succeeds. We may be leaking memory...

[Tom Sepez, 2015/10/21 20:03:55]

Acknowledged.

+    return nullptr;
   }
+
   FXFT_Set_Pixel_Sizes(pFace, 0, 64);
   return pFace;
-BadRet:

[Lei Zhang, 2015/10/21 00:51:24]

Die gotos die!

-  if (NULL != ftStream) {
-    FX_Free(ftStream);
-  }
-  return NULL;
 }
+
 int32_t CFX_FontMgrImp::MatchFonts(CFX_FontDescriptorInfos& MatchedFonts,
                                    FX_WORD wCodePage,
                                    FX_DWORD dwFontStyles,
                                    const CFX_WideString& FontName,
                                    FX_WCHAR wcUnicode) {
   MatchedFonts.RemoveAll();
   CFX_WideString wsNormalizedFontName = FontName;
   NormalizeFontName(wsNormalizedFontName);
   static const int32_t nMax = 0xffff;
   CFX_FontDescriptor* pFont = NULL;
@@ skipping 411 matching lines @@
   FontName.Remove('-');
 }
 int32_t CFX_FontMgrImp::IsPartName(const CFX_WideString& Name1,
                                    const CFX_WideString& Name2) {
   if (Name1.Find((const FX_WCHAR*)Name2) != -1) {
     return 1;
   }
   return 0;
 }
 #endif