Remove some CFX_ArrayTemplate in fpdfapi and fpdfdoc

core/fpdfdoc/cpdf_formfield.h

 // Copyright 2016 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
 
 #ifndef CORE_FPDFDOC_CPDF_FORMFIELD_H_
 #define CORE_FPDFDOC_CPDF_FORMFIELD_H_
 
+#include <vector>
+
 #include "core/fpdfdoc/cpdf_aaction.h"
 #include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
+#include "third_party/base/stl_util.h"
 
 #define FIELDTYPE_UNKNOWN 0
 #define FIELDTYPE_PUSHBUTTON 1
 #define FIELDTYPE_CHECKBOX 2
 #define FIELDTYPE_RADIOBUTTON 3
 #define FIELDTYPE_COMBOBOX 4
 #define FIELDTYPE_LISTBOX 5
 #define FIELDTYPE_TEXTFIELD 6
 #define FIELDTYPE_SIGNATURE 7
 
@@ skipping 26 matching lines @@
   CFX_WideString GetFullName() const;
 
   Type GetType() const { return m_Type; }
   uint32_t GetFlags() const { return m_Flags; }
 
   CPDF_Dictionary* GetFieldDict() const { return m_pDict; }
   void SetFieldDict(CPDF_Dictionary* pDict) { m_pDict = pDict; }
 
   bool ResetField(bool bNotify = false);
 
-  int CountControls() const { return m_ControlList.GetSize(); }
+  int CountControls() const {
+    return pdfium::CollectionSize<int>(m_ControlList);
+  }
 
-  CPDF_FormControl* GetControl(int index) const {
-    return m_ControlList.GetAt(index);
-  }
+  CPDF_FormControl* GetControl(int index) const { return m_ControlList[index]; }
 
   int GetControlIndex(const CPDF_FormControl* pControl) const;
   int GetFieldType() const;
 
   CPDF_AAction GetAdditionalAction() const;
   CFX_WideString GetAlternateName() const;
   CFX_WideString GetMappingName() const;
 
   uint32_t GetFieldFlags() const;
   CFX_ByteString GetDefaultStyle() const;
@@ skipping 67 matching lines @@
   void NotifyAfterSelectionChange();
 
   bool NotifyBeforeValueChange(const CFX_WideString& value);
   void NotifyAfterValueChange();
 
   bool NotifyListOrComboBoxBeforeChange(const CFX_WideString& value);
   void NotifyListOrComboBoxAfterChange();
 
   CPDF_FormField::Type m_Type;
   uint32_t m_Flags;
   CPDF_InterForm* m_pForm;

[dsinclair, 2017/01/10 14:11:11]

const?

[Tom Sepez, 2017/01/10 18:06:27]

Done.

   CPDF_Dictionary* m_pDict;
-  CFX_ArrayTemplate<CPDF_FormControl*> m_ControlList;
+  std::vector<CPDF_FormControl*> m_ControlList;

[dsinclair, 2017/01/10 14:11:11]

It looks like the InterForm owns the control? Should we make this a WeakPtr or
are we depending on all fields being destroyed before the InterForm is
destroyed?

Can we add a comment that the FormControl is owned by the InterForm parent?

[Tom Sepez, 2017/01/10 18:06:27]

Not sure.  Just leaving this alone for the moment.
Done.

   FX_FLOAT m_FontSize;
   CPDF_Font* m_pFont;
 };
 
 #endif  // CORE_FPDFDOC_CPDF_FORMFIELD_H_