Get rid of most uses of CFX_PtrArray.

I didn't go whole hog and replace these with std::vector,
but in the mean time, it is silly to cast a typedef for
a template instantiated against void* when we can just
instantiate the template against the actual type.

The ones that remain are actual heterogeneous arrays with
wacky casting.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1518593002 .

4 files changed, 3 insertions, 5 deletions

diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index f910cc188e..532ede2a08 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -350,7 +350,7 @@ class CPDF_Array : public CPDF_Object {
  protected:
   ~CPDF_Array();
 
-  CFX_PtrArray m_Objects;
+  CFX_ArrayTemplate<CPDF_Object*> m_Objects;
   friend class CPDF_Object;
 };
 inline CPDF_Array* ToArray(CPDF_Object* obj) {
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 27e40f4486..6823dc1f96 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -196,7 +196,7 @@ class CPDF_PageContentGenerate {
  private:
   CPDF_Page* m_pPage;
   CPDF_Document* m_pDocument;
-  CFX_PtrArray m_pageObjects;
+  CFX_ArrayTemplate<CPDF_PageObject*> m_pageObjects;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index efb955be21..ec005de812 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -959,7 +959,7 @@ class CPDF_PageNode {
   ~CPDF_PageNode();
   PDF_PAGENODE_TYPE m_type;
   FX_DWORD m_dwPageNo;
-  CFX_PtrArray m_childNode;
+  CFX_ArrayTemplate<CPDF_PageNode*> m_childNode;
 };
 enum PDF_DATAAVAIL_STATUS {
   PDF_DATAAVAIL_HEADER = 0,
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index cdd7e38d65..8d87b588c1 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -233,7 +233,6 @@ class CPDF_PageRenderCache {
     m_nCacheSize = 0;
     m_pCurImageCache = NULL;
     m_bCurFindCache = FALSE;
-    m_pCurImageCaches = NULL;
   }
   ~CPDF_PageRenderCache() { ClearAll(); }
   void ClearAll();
@@ -272,7 +271,6 @@ class CPDF_PageRenderCache {
 
   FX_BOOL Continue(IFX_Pause* pPause);
   CPDF_ImageCache* m_pCurImageCache;
-  CFX_PtrArray* m_pCurImageCaches;
 
  protected:
   friend class CPDF_Page;