Merge to XFA: Get rid of most uses of CFX_PtrArray.

core/src/fpdfapi/fpdf_page/pageint.h

 // 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
 
 #ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
@@ skipping 303 matching lines @@
   int m_Level;
   CFX_AffineMatrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
   CPDF_ParseOptions m_Options;
   _ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
   FX_DWORD m_ParamStartPos;
   FX_DWORD m_ParamCount;
   CPDF_StreamParser* m_pSyntax;
   nonstd::unique_ptr<CPDF_AllStates> m_pCurStates;
   CPDF_ContentMark m_CurContentMark;
-  CFX_PtrArray m_ClipTextList;
+  CFX_ArrayTemplate<CPDF_TextObject*> m_ClipTextList;
   CPDF_TextObject* m_pLastTextObject;
   FX_FLOAT m_DefFontSize;
   int m_CompatCount;
   FX_PATHPOINT* m_pPathPoints;
   int m_PathPointCount;
   int m_PathAllocSize;
   FX_FLOAT m_PathStartX;
   FX_FLOAT m_PathStartY;
   FX_FLOAT m_PathCurrentX;
   FX_FLOAT m_PathCurrentY;
   int m_PathClipType;
   CFX_ByteString m_LastImageName;
   CPDF_Image* m_pLastImage;
   CFX_BinaryBuf m_LastImageDict;
   CFX_BinaryBuf m_LastImageData;
   CPDF_Dictionary* m_pLastImageDict;
   CPDF_Dictionary* m_pLastCloneImageDict;
   FX_BOOL m_bReleaseLastDict;
   FX_BOOL m_bSameLastDict;
   FX_BOOL m_bColored;
   FX_FLOAT m_Type3Data[6];
   FX_BOOL m_bResourceMissing;
-  CFX_PtrArray m_StateStack;
+  CFX_ArrayTemplate<CPDF_AllStates*> m_StateStack;
 };
 class CPDF_ContentParser {
  public:
   enum ParseStatus { Ready, ToBeContinued, Done };
 
   CPDF_ContentParser();
   ~CPDF_ContentParser();
 
   ParseStatus GetStatus() { return m_Status; }
   void Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions);
@@ skipping 161 matching lines @@
                  FX_FLOAT& G,
                  FX_FLOAT& B) const override;
   CPDF_ColorSpace* GetBaseCS() const override;
 
  private:
   CPDF_ColorSpace* m_pBaseCS;
   CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_