Get rid of most uses of CFX_PtrArray.

core/src/fpdfdoc/doc_form.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 "core/include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
@@ skipping 18 matching lines @@
 
  protected:
   const FX_WCHAR* m_pStart;
   const FX_WCHAR* m_pEnd;
   const FX_WCHAR* m_pCur;
 };
 class CFieldTree {
  public:
   struct _Node {
     _Node* parent;
-    CFX_PtrArray children;
+    CFX_ArrayTemplate<_Node*> children;
     CFX_WideString short_name;
     CPDF_FormField* field_ptr;
     int CountFields(int nLevel = 0) {
       if (nLevel > nMaxRecursion) {
         return 0;
       }
       if (field_ptr) {
         return 1;
       }
       int count = 0;
       for (int i = 0; i < children.GetSize(); i++) {
-        count += ((_Node*)children.GetAt(i))->CountFields(nLevel + 1);
+        count += children.GetAt(i)->CountFields(nLevel + 1);
       }
       return count;
     }
     CPDF_FormField* GetField(int* fields_to_go) {
       if (field_ptr) {
         if (*fields_to_go == 0) {
           return field_ptr;
         }
         --*fields_to_go;
         return NULL;
       }
       for (int i = 0; i < children.GetSize(); i++) {
-        _Node* pNode = (_Node*)children.GetAt(i);
-        CPDF_FormField* pField = pNode->GetField(fields_to_go);
-        if (pField) {
+        if (CPDF_FormField* pField = children.GetAt(i)->GetField(fields_to_go))
           return pField;
-        }
       }
       return NULL;
     }
     CPDF_FormField* GetField(int index) {
       int fields_to_go = index;
       return GetField(&fields_to_go);
     }
   };
   CFieldTree();
   ~CFieldTree();
@@ skipping 23 matching lines @@
     return NULL;
   }
   _Node* pNode = new _Node;
   pNode->parent = pParent;
   pNode->short_name = short_name;
   pNode->field_ptr = field_ptr;
   pParent->children.Add(pNode);
   return pNode;
 }
 void CFieldTree::RemoveNode(_Node* pNode, int nLevel) {
-  if (pNode == NULL) {
+  if (!pNode) {
     return;
   }
-  if (nLevel > nMaxRecursion) {
-    delete pNode;
-    return;
-  }
-  CFX_PtrArray& ptr_array = pNode->children;
-  for (int i = 0; i < ptr_array.GetSize(); i++) {
-    _Node* pChild = (_Node*)ptr_array[i];
-    RemoveNode(pChild, nLevel + 1);
+  if (nLevel <= nMaxRecursion) {
+    for (int i = 0; i < pNode->children.GetSize(); i++) {
+      RemoveNode(pNode->children[i], nLevel + 1);
+    }
   }
   delete pNode;
 }
 CFieldTree::_Node* CFieldTree::_Lookup(_Node* pParent,
                                        const CFX_WideString& short_name) {
   if (pParent == NULL) {
     return NULL;
   }
-  CFX_PtrArray& ptr_array = pParent->children;
-  for (int i = 0; i < ptr_array.GetSize(); i++) {
-    _Node* pNode = (_Node*)ptr_array[i];
+  for (int i = 0; i < pParent->children.GetSize(); i++) {
+    _Node* pNode = pParent->children[i];
     if (pNode->short_name.GetLength() == short_name.GetLength() &&
         FXSYS_memcmp(pNode->short_name.c_str(), short_name.c_str(),
                      short_name.GetLength() * sizeof(FX_WCHAR)) == 0) {
       return pNode;
     }
   }
   return NULL;
 }
 void CFieldTree::RemoveAll() {
-  CFX_PtrArray& ptr_array = m_Root.children;
-  for (int i = 0; i < ptr_array.GetSize(); i++) {
-    _Node* pNode = (_Node*)ptr_array[i];
-    RemoveNode(pNode);
+  for (int i = 0; i < m_Root.children.GetSize(); i++) {
+    RemoveNode(m_Root.children[i]);
   }
 }
 void CFieldTree::SetField(const CFX_WideString& full_name,
                           CPDF_FormField* field_ptr) {
   if (full_name == L"") {
     return;
   }
   CFieldNameExtractor name_extractor(full_name);
   const FX_WCHAR* pName;
   FX_STRSIZE nLength;
@@ skipping 38 matching lines @@
   FX_STRSIZE nLength;
   name_extractor.GetNext(pName, nLength);
   _Node *pNode = &m_Root, *pLast = NULL;
   while (nLength > 0 && pNode) {
     pLast = pNode;
     CFX_WideString name = CFX_WideString(pName, nLength);
     pNode = _Lookup(pLast, name);
     name_extractor.GetNext(pName, nLength);
   }
   if (pNode && pNode != &m_Root) {
-    CFX_PtrArray& ptr_array = pLast->children;
-    for (int i = 0; i < ptr_array.GetSize(); i++) {
-      if (pNode == (_Node*)ptr_array[i]) {
-        ptr_array.RemoveAt(i);
+    for (int i = 0; i < pLast->children.GetSize(); i++) {
+      if (pNode == pLast->children[i]) {
+        pLast->children.RemoveAt(i);
         break;
       }
     }
     CPDF_FormField* pField = pNode->field_ptr;
     RemoveNode(pNode);
     return pField;
   }
   return NULL;
 }
 CFieldTree::_Node* CFieldTree::FindNode(const CFX_WideString& full_name) {
@@ skipping 1038 matching lines @@
     FDF_ImportField(pField, L"", bNotify);
   }
   if (bNotify && m_pFormNotify != NULL) {
     m_pFormNotify->AfterFormImportData(this);
   }
   return TRUE;
 }
 void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
   m_pFormNotify = (CPDF_FormNotify*)pNotify;
 }