From 51709bea3ce113df7d36a5fe6415036e26fc3236 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Thu, 8 Dec 2016 10:55:57 -0800
Subject: Replace CFX_WideStringArray with std::vector

Minimalist changes with the tidying of the code to
use better loop iterators as a follow-up.

Review-Url: https://codereview.chromium.org/2556963004
---
 xfa/fgas/font/cfgas_fontmgr.cpp | 23 +++++++++++------------
 xfa/fgas/font/cfgas_fontmgr.h   |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'xfa/fgas/font')

diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 6f998a9975..5cf5a46d0e 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -947,12 +947,12 @@ int32_t CFGAS_FontMgr::CalcPenalty(CFX_FontDescriptor* pInstalled,
   int32_t nPenalty = 30000;
   if (FontName.GetLength() != 0) {
     if (FontName != pInstalled->m_wsFaceName) {
-      int32_t i;
-      for (i = 0; i < pInstalled->m_wsFamilyNames.GetSize(); i++) {
+      size_t i;
+      for (i = 0; i < pInstalled->m_wsFamilyNames.size(); ++i) {
         if (pInstalled->m_wsFamilyNames[i] == FontName)
           break;
       }
-      if (i == pInstalled->m_wsFamilyNames.GetSize())
+      if (i == pInstalled->m_wsFamilyNames.size())
         nPenalty += 0xFFFF;
       else
         nPenalty -= 28000;
@@ -961,12 +961,12 @@ int32_t CFGAS_FontMgr::CalcPenalty(CFX_FontDescriptor* pInstalled,
     }
     if (30000 == nPenalty &&
         0 == IsPartName(pInstalled->m_wsFaceName, FontName)) {
-      int32_t i;
-      for (i = 0; i < pInstalled->m_wsFamilyNames.GetSize(); i++) {
+      size_t i;
+      for (i = 0; i < pInstalled->m_wsFamilyNames.size(); i++) {
         if (IsPartName(pInstalled->m_wsFamilyNames[i], FontName) != 0)
           break;
       }
-      if (i == pInstalled->m_wsFamilyNames.GetSize())
+      if (i == pInstalled->m_wsFamilyNames.size())
         nPenalty += 0xFFFF;
       else
         nPenalty -= 26000;
@@ -1058,13 +1058,12 @@ void CFGAS_FontMgr::RegisterFace(FXFT_Face pFace,
       table.clear();
   }
   GetNames(table.empty() ? nullptr : table.data(), pFont->m_wsFamilyNames);
-
-  pFont->m_wsFamilyNames.Add(CFX_ByteString(pFace->family_name).UTF8Decode());
+  pFont->m_wsFamilyNames.push_back(
+      CFX_ByteString(pFace->family_name).UTF8Decode());
   pFont->m_wsFaceName =
       pFaceName ? *pFaceName
                 : CFX_WideString::FromLocal(FXFT_Get_Postscript_Name(pFace));
   pFont->m_nFaceIndex = pFace->face_index;
-
   m_InstalledFonts.Add(pFont.release());
 }
 
@@ -1106,7 +1105,7 @@ uint32_t CFGAS_FontMgr::GetFlags(FXFT_Face pFace) {
 }
 
 void CFGAS_FontMgr::GetNames(const uint8_t* name_table,
-                             CFX_WideStringArray& Names) {
+                             std::vector<CFX_WideString>& Names) {
   if (!name_table)
     return;
 
@@ -1130,14 +1129,14 @@ void CFGAS_FontMgr::GetNames(const uint8_t* name_table,
         FX_WCHAR wcTemp = GetUInt16(lpStr + nNameOffset + k * 2);
         wsFamily += wcTemp;
       }
-      Names.Add(wsFamily);
+      Names.push_back(wsFamily);
       continue;
     }
     for (uint16_t k = 0; k < nNameLength; k++) {
       FX_WCHAR wcTemp = GetUInt8(lpStr + nNameOffset + k);
       wsFamily += wcTemp;
     }
-    Names.Add(wsFamily);
+    Names.push_back(wsFamily);
   }
 }
 
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index ce87b4e2b8..0da84fd6e9 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -137,7 +137,7 @@ class CFX_FontDescriptor {
 
   int32_t m_nFaceIndex;
   CFX_WideString m_wsFaceName;
-  CFX_WideStringArray m_wsFamilyNames;
+  std::vector<CFX_WideString> m_wsFamilyNames;
   uint32_t m_dwFontStyles;
   uint32_t m_dwUsb[4];
   uint32_t m_dwCsb[2];
@@ -217,7 +217,7 @@ class CFGAS_FontMgr {
   void RegisterFace(FXFT_Face pFace, const CFX_WideString* pFaceName);
   void RegisterFaces(const CFX_RetainPtr<IFX_SeekableReadStream>& pFontStream,
                      const CFX_WideString* pFaceName);
-  void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names);
+  void GetNames(const uint8_t* name_table, std::vector<CFX_WideString>& Names);
   std::vector<uint16_t> GetCharsets(FXFT_Face pFace) const;
   void GetUSBCSB(FXFT_Face pFace, uint32_t* USB, uint32_t* CSB);
   uint32_t GetFlags(FXFT_Face pFace);
-- 
cgit v1.2.3