diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:39:40 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:39:40 -0800 |
| commit | bd573f126f93acc2034be2df1c6f571670f76c35 (patch) | |
| tree | beeea3b9370bb7490ed5933dadbef857cb8df23d /core/include/fpdfapi | |
| parent | e021e084717b8cc43f8a0667ad9d1a807dfe381c (diff) | |
| download | pdfium-bd573f126f93acc2034be2df1c6f571670f76c35.tar.xz | |
Merge to XFA: Get rid of most uses of CFX_PtrArray.
Original Review URL: https://codereview.chromium.org/1518593002 .
(cherry picked from commit 035359cd8ddb555fa33b6133db4fd405e4660712)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1513103002 .
Diffstat (limited to 'core/include/fpdfapi')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 2 | ||||
| -rw-r--r-- | core/include/fpdfapi/fpdf_page.h | 2 | ||||
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 2 | ||||
| -rw-r--r-- | core/include/fpdfapi/fpdf_render.h | 2 |
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; |