Remove some CFX_ArrayTemplate in fpdfapi and fpdfdoc

core/fpdfdoc/cpdf_formcontrol.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_FORMCONTROL_H_
 #define CORE_FPDFDOC_CPDF_FORMCONTROL_H_
 
 #include "core/fpdfdoc/cpdf_aaction.h"
@@ skipping 28 matching lines @@
 class CPDF_FormField;
 class CPDF_InterForm;
 class CPDF_OCContext;
 class CPDF_RenderOptions;
 class CPDF_Stream;
 
 class CPDF_FormControl {
  public:
   enum HighlightingMode { None = 0, Invert, Outline, Push, Toggle };
 
+  CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict);

[Tom Sepez, 2017/01/09 18:37:07]

Note: For MakeUnique<> to be allowed to construct these.

+
   CPDF_FormField::Type GetType() const { return m_pField->GetType(); }
   CPDF_InterForm* GetInterForm() const { return m_pForm; }
   CPDF_FormField* GetField() const { return m_pField; }
   CPDF_Dictionary* GetWidget() const { return m_pWidgetDict; }
   CFX_FloatRect GetRect() const { return m_pWidgetDict->GetRectFor("Rect"); }
 
   void DrawControl(CFX_RenderDevice* pDevice,
                    CFX_Matrix* pMatrix,
                    CPDF_Page* pPage,
                    CPDF_Annot::AppearanceMode mode,
@@ skipping 45 matching lines @@
   CPDF_AAction GetAdditionalAction();
   CPDF_DefaultAppearance GetDefaultAppearance();
 
   CPDF_Font* GetDefaultControlFont();
   int GetControlAlignment();
 
  private:
   friend class CPDF_InterForm;
   friend class CPDF_FormField;
 
-  CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict);
-
   CFX_ByteString GetOnStateName() const;
   void SetOnStateName(const CFX_ByteString& csOn);
   void CheckControl(bool bChecked);
   FX_ARGB GetColor(int& iColorType, const CFX_ByteString& csEntry);
   FX_FLOAT GetOriginalColor(int index, const CFX_ByteString& csEntry);
   void GetOriginalColor(int& iColorType,
                         FX_FLOAT fc[4],
                         const CFX_ByteString& csEntry);
 
   CFX_WideString GetCaption(const CFX_ByteString& csEntry);
   CPDF_Stream* GetIcon(const CFX_ByteString& csEntry);
   CPDF_ApSettings GetMK() const;
 
   CPDF_FormField* const m_pField;
   CPDF_Dictionary* const m_pWidgetDict;
   CPDF_InterForm* const m_pForm;
 };
 
 #endif  // CORE_FPDFDOC_CPDF_FORMCONTROL_H_