diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-26 12:14:35 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-26 12:14:35 -0700 |
| commit | bf60b29fc07c668022fc06517782aeda25e8246c (patch) | |
| tree | e96c1f8ffbe2ce381c3b45ed3da8ac8cf682dc03 /fpdfsdk/include/fsdk_mgr.h | |
| parent | 56a547dd81202c49d01232c358a28db886fd46ed (diff) | |
| download | pdfium-bf60b29fc07c668022fc06517782aeda25e8246c.tar.xz | |
Merge to XFA: Cleanup parts of CPDFSDK_AnnotIterator and CPDFSDK_PageView.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1411203007 .
(cherry picked from commit 9b2741829b8a8c511ef0f2f313ff53d77ac96307)
Review URL: https://codereview.chromium.org/1408263005 .
Diffstat (limited to 'fpdfsdk/include/fsdk_mgr.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 300ca2287e..d19c9233d7 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,6 +12,7 @@ #include "../../core/include/fpdftext/fpdf_text.h" #include "../../public/fpdf_formfill.h" #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define. +#include "../../third_party/base/nonstd_unique_ptr.h" #include "fsdk_common.h" #include "fsdk_define.h" #include "fx_systemhandler.h" @@ -554,8 +555,8 @@ class CPDFSDK_PageView final { CPDFSDK_Annot* AddAnnot(CPDF_Annot* pPDFAnnot); CPDFSDK_Annot* AddAnnot(IXFA_Widget* pPDFAnnot); FX_BOOL DeleteAnnot(CPDFSDK_Annot* pAnnot); - int CountAnnots(); - CPDFSDK_Annot* GetAnnot(int nIndex); + int CountAnnots() const; + CPDFSDK_Annot* GetAnnot(size_t nIndex); CPDFSDK_Annot* GetAnnotByDict(CPDF_Dictionary* pDict); CPDFSDK_Annot* GetAnnotByXFAWidget(IXFA_Widget* hWidget); CPDFXFA_Page* GetPDFXFAPage() { return m_page; } @@ -575,11 +576,13 @@ class CPDFSDK_PageView final { double deltaY, const CPDF_Point& point, int nFlag); - FX_BOOL IsValidAnnot(void* p); + FX_BOOL IsValidAnnot(CPDF_Annot* p) const; void GetCurrentMatrix(CPDF_Matrix& matrix) { matrix = m_curMatrix; } void UpdateRects(CFX_RectArray& rects); void UpdateView(CPDFSDK_Annot* pAnnot); - CFX_PtrArray* GetAnnotList() { return &m_fxAnnotArray; } + const std::vector<CPDFSDK_Annot*>& GetAnnotList() const { + return m_fxAnnotArray; + } int GetPageIndex(); void LoadFXAnnots(); @@ -591,11 +594,11 @@ class CPDFSDK_PageView final { private: void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice, CPDFSDK_Widget* pWidget); + CPDF_Matrix m_curMatrix; CPDFXFA_Page* m_page; - CPDF_AnnotList* m_pAnnotList; - // CPDFSDK_Annot* m_pFocusAnnot; - CFX_PtrArray m_fxAnnotArray; + nonstd::unique_ptr<CPDF_AnnotList> m_pAnnotList; + std::vector<CPDFSDK_Annot*> m_fxAnnotArray; CPDFSDK_Document* m_pSDKDoc; CPDFSDK_Annot* m_CaptureWidget; FX_BOOL m_bEnterWidget; |