6 files changed, 10 insertions, 10 deletions
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
index c5576ae8e2..2c41c13a5a 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
@@ -499,7 +499,7 @@ void CPDF_DataAvail::ResetFirstCheck(int iPage) {
 
 FX_BOOL CPDF_DataAvail::CheckPage(IPDF_DataAvail::DownloadHints* pHints) {
   FX_DWORD iPageObjs = m_PageObjList.GetSize();
-  CFX_DWordArray UnavailObjList;
+  CFX_ArrayTemplate<FX_DWORD> UnavailObjList;
   for (FX_DWORD i = 0; i < iPageObjs; ++i) {
     FX_DWORD dwPageObjNum = m_PageObjList.GetAt(i);
     FX_BOOL bExist = FALSE;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
index 4c8d3719ff..036de72968 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
@@ -179,8 +179,8 @@ class CPDF_DataAvail final : public IPDF_DataAvail {
   FX_DWORD m_bufferSize;
   CFX_ByteString m_WordBuf;
   uint8_t m_bufferData[512];
-  CFX_DWordArray m_XRefStreamList;
-  CFX_DWordArray m_PageObjList;
+  CFX_ArrayTemplate<FX_DWORD> m_XRefStreamList;
+  CFX_ArrayTemplate<FX_DWORD> m_PageObjList;
   FX_DWORD m_PagesObjNum;
   FX_BOOL m_bLinearized;
   FX_DWORD m_dwFirstPageNo;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
index 0dd869210e..eafda43965 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
@@ -126,7 +126,7 @@ FX_BOOL CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) {
   if (!CanReadFromBitStream(hStream, required_bits))
     return FALSE;
 
-  CFX_DWordArray dwPageLenArray;
+  CFX_ArrayTemplate<FX_DWORD> dwPageLenArray;
   for (int i = 0; i < nPages; ++i) {
     FX_SAFE_DWORD safePageLen = hStream->GetBits(dwDeltaPageLenBits);
     safePageLen += dwPageLeastLen;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
index 3271f5e1ec..f6f862fab6 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
@@ -51,10 +51,10 @@ class CPDF_HintTables {
   CPDF_DataAvail* m_pDataAvail;
   FX_DWORD m_nFirstPageSharedObjs;
   FX_FILESIZE m_szFirstPageObjOffset;
-  CFX_DWordArray m_dwDeltaNObjsArray;
-  CFX_DWordArray m_dwNSharedObjsArray;
-  CFX_DWordArray m_dwSharedObjNumArray;
-  CFX_DWordArray m_dwIdentifierArray;
+  CFX_ArrayTemplate<FX_DWORD> m_dwDeltaNObjsArray;
+  CFX_ArrayTemplate<FX_DWORD> m_dwNSharedObjsArray;
+  CFX_ArrayTemplate<FX_DWORD> m_dwSharedObjNumArray;
+  CFX_ArrayTemplate<FX_DWORD> m_dwIdentifierArray;
   std::vector<FX_FILESIZE> m_szPageOffsetArray;
   std::vector<FX_FILESIZE> m_szSharedObjOffsetArray;
 };
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
index e9896d8099..5312e62d43 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
@@ -1010,7 +1010,7 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, FX_BOOL bMainXRef) {
     return FALSE;
   }
 
-  CFX_DWordArray WidthArray;
+  CFX_ArrayTemplate<FX_DWORD> WidthArray;
   FX_SAFE_DWORD dwAccWidth = 0;
   for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
     WidthArray.Add(pArray->GetIntegerAt(i));
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
index 02a55dd455..21b9d250fd 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
@@ -129,7 +129,7 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder {
   FX_BOOL m_bLinearized;
   FX_DWORD m_dwFirstPageNo;
   FX_DWORD m_dwFirstPageObjNum;
-  CFX_DWordArray m_PageList;
+  CFX_ArrayTemplate<FX_DWORD> m_PageList;
   CPDF_DocPageData* m_pDocPage;
   CPDF_DocRenderData* m_pDocRender;
 };