Replace CFX_PtryArray with typesafe CFX_ArrayTemplate, Part 7

xfa/fgas/crt/fgas_utils.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 "xfa/fgas/crt/fgas_utils.h"
 
 #include <algorithm>
 
@@ skipping 123 matching lines @@
     m_pData->iTotalCount = 0;
   }
   m_pData->iBlockCount = 0;
 }
 
 CFX_BaseMassArrayImp::CFX_BaseMassArrayImp(int32_t iChunkSize,
                                            int32_t iBlockSize)
     : m_iChunkSize(iChunkSize),
       m_iBlockSize(iBlockSize),
       m_iChunkCount(0),
-      m_iBlockCount(0) {
+      m_iBlockCount(0),
+      m_pData(new CFX_ArrayTemplate<void*>()) {
   ASSERT(m_iChunkSize > 0 && m_iBlockSize > 0);
-  m_pData = new CFX_PtrArray;
   m_pData->SetSize(16);
 }
 CFX_BaseMassArrayImp::~CFX_BaseMassArrayImp() {
   RemoveAll();
   delete m_pData;
 }
 uint8_t* CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) {
   ASSERT(index > -1);
   uint8_t* pChunk;
   if (index < m_iBlockCount) {
@@ skipping 171 matching lines @@
   return m_pData->RemoveLast(iCount);
 }
 void CFX_BaseMassArray::RemoveAll(FX_BOOL bLeaveMemory) {
   m_pData->RemoveAll(bLeaveMemory);
 }
 
 struct FX_BASEDISCRETEARRAYDATA {
   int32_t iBlockSize;
   int32_t iChunkSize;
   int32_t iChunkCount;
-  CFX_PtrArray ChunkBuffer;
+  CFX_ArrayTemplate<uint8_t*> ChunkBuffer;
 };
 
 CFX_BaseDiscreteArray::CFX_BaseDiscreteArray(int32_t iChunkSize,
                                              int32_t iBlockSize) {
   ASSERT(iChunkSize > 0 && iBlockSize > 0);
   FX_BASEDISCRETEARRAYDATA* pData = new FX_BASEDISCRETEARRAYDATA;
   m_pData = pData;
   pData->ChunkBuffer.SetSize(16);
   pData->iChunkCount = 0;
   pData->iChunkSize = iChunkSize;
   pData->iBlockSize = iBlockSize;
 }
 CFX_BaseDiscreteArray::~CFX_BaseDiscreteArray() {
   RemoveAll();
   delete static_cast<FX_BASEDISCRETEARRAYDATA*>(m_pData);
 }
 uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
   ASSERT(index > -1);
   FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
   int32_t& iChunkCount = pData->iChunkCount;
   int32_t iChunkSize = pData->iChunkSize;
   uint8_t* pChunk = NULL;
   int32_t iChunk = index / iChunkSize;
   if (iChunk < iChunkCount) {
-    pChunk = (uint8_t*)pData->ChunkBuffer.GetAt(iChunk);
+    pChunk = pData->ChunkBuffer.GetAt(iChunk);
   }
   if (!pChunk) {
     pChunk = FX_Alloc2D(uint8_t, iChunkSize, pData->iBlockSize);
     FXSYS_memset(pChunk, 0, iChunkSize * pData->iBlockSize);
     pData->ChunkBuffer.SetAtGrow(iChunk, pChunk);
     if (iChunkCount <= iChunk) {
       iChunkCount = iChunk + 1;
     }
   }
   return pChunk + (index % iChunkSize) * pData->iBlockSize;
 }
 uint8_t* CFX_BaseDiscreteArray::GetAt(int32_t index) const {
-  ASSERT(index > -1);
+  ASSERT(index >= 0);
   FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
   int32_t iChunkSize = pData->iChunkSize;
   int32_t iChunk = index / iChunkSize;
-  if (iChunk >= pData->iChunkCount) {
-    return NULL;
-  }
-  uint8_t* pChunk = (uint8_t*)pData->ChunkBuffer.GetAt(iChunk);
-  if (pChunk == NULL) {
-    return NULL;
-  }
+  if (iChunk >= pData->iChunkCount)
+    return nullptr;
+
+  uint8_t* pChunk = pData->ChunkBuffer.GetAt(iChunk);
+  if (!pChunk)
+    return nullptr;
+
   return pChunk + (index % iChunkSize) * pData->iBlockSize;
 }
 void CFX_BaseDiscreteArray::RemoveAll() {
   FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
-  CFX_PtrArray& ChunkBuffer = pData->ChunkBuffer;
+  CFX_ArrayTemplate<uint8_t*>& ChunkBuffer = pData->ChunkBuffer;
   int32_t& iChunkCount = pData->iChunkCount;
-  for (int32_t i = 0; i < iChunkCount; i++) {
-    void* p = ChunkBuffer.GetAt(i);
-    if (p == NULL) {
-      continue;
-    }
-    FX_Free(p);
-  }
+  for (int32_t i = 0; i < iChunkCount; i++)
+    FX_Free(ChunkBuffer.GetAt(i));
+
   ChunkBuffer.RemoveAll();
   iChunkCount = 0;
 }
 CFX_BaseStack::CFX_BaseStack(int32_t iChunkSize, int32_t iBlockSize) {
   m_pData = new CFX_BaseMassArrayImp(iChunkSize, iBlockSize);
 }
 CFX_BaseStack::~CFX_BaseStack() {
   delete (CFX_BaseMassArrayImp*)m_pData;
 }
 uint8_t* CFX_BaseStack::Push() {
@@ skipping 15 matching lines @@
 }
 int32_t CFX_BaseStack::GetSize() const {
   return m_pData->m_iBlockCount;
 }
 uint8_t* CFX_BaseStack::GetAt(int32_t index) const {
   return m_pData->GetAt(index);
 }
 void CFX_BaseStack::RemoveAll(FX_BOOL bLeaveMemory) {
   m_pData->RemoveAll(bLeaveMemory);
 }