From d15ba4e29607665db35bc6fb610cc566981b324a Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 29 Apr 2016 09:45:46 -0700
Subject: Replace CFX_PtryArray with typesafe CFX_ArrayTemplate, Part 7

Remaining uses are all in fxbarcode/.

Review-Url: https://codereview.chromium.org/1937453002
---
 xfa/fgas/crt/fgas_utils.cpp | 36 ++++++++++++++++--------------------
 xfa/fgas/crt/fgas_utils.h   |  3 ++-
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'xfa/fgas/crt')

diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp
index 01792b833a..4f15fc4845 100644
--- a/xfa/fgas/crt/fgas_utils.cpp
+++ b/xfa/fgas/crt/fgas_utils.cpp
@@ -141,9 +141,9 @@ CFX_BaseMassArrayImp::CFX_BaseMassArrayImp(int32_t iChunkSize,
     : 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() {
@@ -335,7 +335,7 @@ 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,
@@ -360,7 +360,7 @@ uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
   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);
@@ -373,30 +373,26 @@ uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
   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;
 }
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h
index ebbcf4bd97..ab94f6ed40 100644
--- a/xfa/fgas/crt/fgas_utils.h
+++ b/xfa/fgas/crt/fgas_utils.h
@@ -202,11 +202,12 @@ class CFX_BaseMassArrayImp : public CFX_Target {
                int32_t iCount = -1);
   int32_t RemoveLast(int32_t iCount = -1);
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE);
+
   int32_t m_iChunkSize;
   int32_t m_iBlockSize;
   int32_t m_iChunkCount;
   int32_t m_iBlockCount;
-  CFX_PtrArray* m_pData;
+  CFX_ArrayTemplate<void*>* m_pData;
 
  protected:
   void Append(int32_t iDstStart,
-- 
cgit v1.2.3