Remove CFX_PtrArray from xfa/include/fwl

xfa/src/fwl/src/theme/widgettp.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 <algorithm>
 
 #include "xfa/src/foxitlib.h"
 static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
@@ skipping 148 matching lines @@
   return FWL_ERR_Succeeded;
 }
 CFWL_WidgetTP::~CFWL_WidgetTP() {}
 FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget,
                                const FX_WCHAR* strFont,
                                FX_FLOAT fFontSize,
                                FX_ARGB rgbFont) {
   if (!m_pTextOut) {
     return FWL_ERR_Succeeded;
   }
-  m_pFDEFont = FWL_GetFontManager()->FindFont(strFont, 0, 0);
+  m_pFDEFont = CFWL_FontManager::GetInstance()->FindFont(strFont, 0, 0);
   m_pTextOut->SetFont(m_pFDEFont);
   m_pTextOut->SetFontSize(fFontSize);
   m_pTextOut->SetTextColor(rgbFont);
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget,
                                IFX_Font* pFont,
                                FX_FLOAT fFontSize,
                                FX_ARGB rgbFont) {
   if (!m_pTextOut) {
     return FWL_ERR_Succeeded;
   }
   m_pTextOut->SetFont(pFont);
   m_pTextOut->SetFontSize(fFontSize);
   m_pTextOut->SetTextColor(rgbFont);
   return FWL_ERR_Succeeded;
 }
 IFX_Font* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) {
   return m_pFDEFont;
 }
 CFWL_WidgetTP::CFWL_WidgetTP()
     : m_dwRefCount(1), m_pTextOut(NULL), m_pFDEFont(NULL), m_dwThemeID(0) {}
 FX_ERR CFWL_WidgetTP::InitTTO() {
   if (m_pTextOut) {
     return FWL_ERR_Succeeded;
   }
-  m_pFDEFont = FWL_GetFontManager()->FindFont(FX_WSTRC(L"Helvetica"), 0, 0);
+  m_pFDEFont =
+      CFWL_FontManager::GetInstance()->FindFont(FX_WSTRC(L"Helvetica"), 0, 0);
   m_pTextOut = IFDE_TextOut::Create();
   m_pTextOut->SetFont(m_pFDEFont);
   m_pTextOut->SetFontSize(FWLTHEME_CAPACITY_FontSize);
   m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor);
   m_pTextOut->SetEllipsisString(L"...");
   return FWL_ERR_Succeeded;
 }
 FX_ERR CFWL_WidgetTP::FinalizeTTO() {
   if (m_pTextOut) {
     m_pTextOut->Release();
@@ skipping 469 matching lines @@
       ((FX_WORD)srcColor.r * n + (FX_WORD)renderColor.r * scale) >> 8);
   dstColor.g = (uint8_t)(
       ((FX_WORD)srcColor.g * n + (FX_WORD)renderColor.g * scale) >> 8);
   dstColor.b = (uint8_t)(
       ((FX_WORD)srcColor.b * n + (FX_WORD)renderColor.b * scale) >> 8);
   return dstColor;
 }
 CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(NULL) {
   SetColorData(0);
 }
-CFWL_FontManager* FWL_GetFontManager() {
-  static CFWL_FontManager* _fontManager = NULL;
-  if (_fontManager == NULL) {
-    _fontManager = new CFWL_FontManager;
-  }
-  return _fontManager;
-}
-void FWL_ReleaseFontManager() {
-  CFWL_FontManager* fontManager = FWL_GetFontManager();
-  delete fontManager;
-}
 CFWL_FontData::CFWL_FontData()
     : m_dwStyles(0),
       m_dwCodePage(0),
       m_pFont(0),
       m_pFontMgr(NULL)
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
       ,
       m_pFontSource(NULL)
 #endif
 {
@@ skipping 28 matching lines @@
     m_pFontMgr = IFX_FontMgr::Create(FX_GetDefFontEnumerator());
 #else
     m_pFontSource = FX_CreateDefaultFontSourceEnum();
     m_pFontMgr = IFX_FontMgr::Create(m_pFontSource);
 #endif
   }
   m_pFont = IFX_Font::LoadFont(wsFontFamily.GetPtr(), dwFontStyles, dwCodePage,
                                m_pFontMgr);
   return m_pFont != NULL;
 }
+
+CFWL_FontManager* CFWL_FontManager::s_FontManager = nullptr;
+CFWL_FontManager* CFWL_FontManager::GetInstance() {
+  if (!s_FontManager)
+    s_FontManager = new CFWL_FontManager;
+  return s_FontManager;
+}
+void CFWL_FontManager::DestroyInstance() {
+  delete s_FontManager;
+  s_FontManager = nullptr;
+}
 CFWL_FontManager::CFWL_FontManager() {}
-CFWL_FontManager::~CFWL_FontManager() {
-  for (int32_t i = 0; i < m_arrFonts.GetSize(); i++) {
-    delete static_cast<CFWL_FontData*>(m_arrFonts[i]);
-  }
-  m_arrFonts.RemoveAll();
-}
+CFWL_FontManager::~CFWL_FontManager() {}
 IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily,
                                      FX_DWORD dwFontStyles,
                                      FX_WORD wCodePage) {
-  for (int32_t i = 0; i < m_arrFonts.GetSize(); i++) {
-    CFWL_FontData* data = static_cast<CFWL_FontData*>(m_arrFonts[i]);
-    if (data->Equal(wsFontFamily, dwFontStyles, wCodePage)) {
-      return data->GetFont();
-    }
+  for (const auto& pData : m_FontsArray) {
+    if (pData->Equal(wsFontFamily, dwFontStyles, wCodePage))
+      return pData->GetFont();
   }
-  CFWL_FontData* fontData = new CFWL_FontData;
-  if (!fontData->LoadFont(wsFontFamily, dwFontStyles, wCodePage)) {
-    delete fontData;
-    return NULL;
-  }
-  m_arrFonts.Add(fontData);
-  return fontData->GetFont();
+  std::unique_ptr<CFWL_FontData> pFontData(new CFWL_FontData);
+  if (!pFontData->LoadFont(wsFontFamily, dwFontStyles, wCodePage))
+    return nullptr;
+  m_FontsArray.push_back(std::move(pFontData));
+  return m_FontsArray.back()->GetFont();
 }
 FX_BOOL FWLTHEME_Init() {
   return TRUE;
 }
 void FWLTHEME_Release() {
   CFWL_ArrowData::DestroyInstance();
-  FWL_ReleaseFontManager();
+  CFWL_FontManager::DestroyInstance();
 }
 FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID) {
   return 0xffff0000 & dwThemeID;
 }
 FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID) {
   return 0x0000ffff & dwThemeID;
 }
 FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor) {
   return (dwLayout << 16) | (0x0000FFFF & dwColor);
 }
@@ skipping 52 matching lines @@
     m_pColorData->clrEnd[0] = ArgbEncode(255, 175, 204, 251);
     m_pColorData->clrEnd[1] = ArgbEncode(255, 185, 218, 251);
     m_pColorData->clrEnd[2] = ArgbEncode(255, 210, 222, 235);
     m_pColorData->clrEnd[3] = ArgbEncode(255, 243, 241, 236);
     m_pColorData->clrSign[0] = ArgbEncode(255, 77, 97, 133);
     m_pColorData->clrSign[1] = ArgbEncode(255, 77, 97, 133);
     m_pColorData->clrSign[2] = ArgbEncode(255, 77, 97, 133);
     m_pColorData->clrSign[3] = ArgbEncode(255, 128, 128, 128);
   }
 }