Clean up CPDF_AnnotList.

core/include/fpdfdoc/fpdf_doc.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_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 376 matching lines @@
 
   CPDF_Annot(CPDF_Dictionary* pDict, CPDF_AnnotList* pList);
   ~CPDF_Annot();
 
   CFX_ByteString GetSubType() const;
 
   FX_DWORD GetFlags() const;
 
   void GetRect(CFX_FloatRect& rect) const;
 
-  CPDF_Dictionary* GetAnnotDict();
+  const CPDF_Dictionary* GetAnnotDict() const { return m_pAnnotDict; }
+  CPDF_Dictionary* GetAnnotDict() { return m_pAnnotDict; }
 
   FX_BOOL DrawAppearance(const CPDF_Page* pPage,
                          CFX_RenderDevice* pDevice,
                          const CFX_AffineMatrix* pUser2Device,
                          AppearanceMode mode,
                          const CPDF_RenderOptions* pOptions);
 
   FX_BOOL DrawInContext(const CPDF_Page* pPage,
                         const CPDF_RenderContext* pContext,
                         const CFX_AffineMatrix* pUser2Device,
@@ skipping 12 matching lines @@
 
   CPDF_AnnotList* const m_pList;
 
   const CFX_ByteString m_sSubtype;
 
   CFX_MapPtrToPtr m_APMap;
 };
 
 class CPDF_AnnotList {
  public:
-  CPDF_AnnotList(CPDF_Page* pPage);
-
+  explicit CPDF_AnnotList(CPDF_Page* pPage);
   ~CPDF_AnnotList();
 
-  void GetAnnotMatrix(const CPDF_Dictionary* pAnnotDict,
-                      const CFX_Matrix* pUser2Device,
-                      CFX_Matrix& matrix) const;
-
-  void GetAnnotRect(const CPDF_Dictionary* pAnnotDict,
-                    const CFX_Matrix* pUser2Device,
-                    CPDF_Rect& rtAnnot) const;
-
-  void DisplayAnnots(const CPDF_Page* pPage,
-                     CFX_RenderDevice* pDevice,
-                     CFX_AffineMatrix* pMatrix,
-                     FX_BOOL bShowWidget,
-                     CPDF_RenderOptions* pOptions);
-
   void DisplayAnnots(const CPDF_Page* pPage,
                      CPDF_RenderContext* pContext,
                      FX_BOOL bPrinting,
                      CFX_AffineMatrix* pMatrix,
                      FX_BOOL bShowWidget,
                      CPDF_RenderOptions* pOptions) {
-    DisplayAnnots(pPage, NULL, pContext, bPrinting, pMatrix,
-                  bShowWidget ? 3 : 1, pOptions, NULL);
+    DisplayAnnots(pPage, nullptr, pContext, bPrinting, pMatrix,
+                  bShowWidget ? 3 : 1, pOptions, nullptr);
   }
-
-  void DisplayAnnots(const CPDF_Page* pPage,
-                     CPDF_RenderContext* pContext,
-                     FX_BOOL bPrinting,
-                     CFX_AffineMatrix* pMatrix,
-                     FX_BOOL bShowWidget,
-                     CPDF_RenderOptions* pOptions,
-                     FX_RECT* pClipRect) {
-    DisplayAnnots(pPage, NULL, pContext, bPrinting, pMatrix,
-                  bShowWidget ? 3 : 1, pOptions, pClipRect);
-  }
-
   void DisplayAnnots(const CPDF_Page* pPage,
                      CFX_RenderDevice* pDevice,
                      CPDF_RenderContext* pContext,
                      FX_BOOL bPrinting,
                      CFX_AffineMatrix* pMatrix,
                      FX_DWORD dwAnnotFlags,
                      CPDF_RenderOptions* pOptions,
                      FX_RECT* pClipRect);
-
-  CPDF_Annot* GetAt(int index) { return (CPDF_Annot*)m_AnnotList.GetAt(index); }
-
-  int Count() { return m_AnnotList.GetSize(); }
-
-  int GetIndex(CPDF_Annot* pAnnot);
-
+  size_t Count() const { return m_AnnotList.size(); }
+  CPDF_Annot* GetAt(size_t index) const { return m_AnnotList[index]; }
+  const std::vector<CPDF_Annot*>& All() const { return m_AnnotList; }
   CPDF_Document* GetDocument() const { return m_pDocument; }
 
  protected:
-  CFX_PtrArray m_AnnotList;
-
-  CPDF_Dictionary* m_pPageDict;
-
-  CPDF_Document* m_pDocument;
-
-  CFX_PtrArray m_Borders;
-
   void DisplayPass(const CPDF_Page* pPage,
                    CFX_RenderDevice* pDevice,
                    CPDF_RenderContext* pContext,
                    FX_BOOL bPrinting,
                    CFX_AffineMatrix* pMatrix,
                    FX_BOOL bWidget,
                    CPDF_RenderOptions* pOptions,
                    FX_RECT* clip_rect);
-  friend class CPDF_Annot;
+
+  CPDF_Document* const m_pDocument;
+  std::vector<CPDF_Annot*> m_AnnotList;
 };
+
 #define COLORTYPE_TRANSPARENT 0
 #define COLORTYPE_GRAY 1
 #define COLORTYPE_RGB 2
 #define COLORTYPE_CMYK 3
 class CPDF_DefaultAppearance {
  public:
   CPDF_DefaultAppearance(const CFX_ByteString& csDA = "") { m_csDA = csDA; }
 
   CPDF_DefaultAppearance(const CPDF_DefaultAppearance& cDA) {
     m_csDA = (CFX_ByteString)(CPDF_DefaultAppearance&)cDA;
@@ skipping 101 matching lines @@
 
   FX_BOOL IsValidFormField(const void* pField);
 
   CPDF_FormField* GetFieldByDict(CPDF_Dictionary* pFieldDict) const;
 
   CPDF_FormControl* GetControlAtPoint(CPDF_Page* pPage,
                                       FX_FLOAT pdf_x,
                                       FX_FLOAT pdf_y,
                                       int* z_order) const;
 
-  CPDF_FormControl* GetControlByDict(CPDF_Dictionary* pWidgetDict) const;
+  CPDF_FormControl* GetControlByDict(const CPDF_Dictionary* pWidgetDict) const;
 
   CPDF_Document* GetDocument() const { return m_pDocument; }
 
   CPDF_Dictionary* GetFormDict() const { return m_pFormDict; }
 
   FX_BOOL NeedConstructAP();
 
   void NeedConstructAP(FX_BOOL bNeedAP);
 
   int CountFieldsInCalculationOrder();
@@ skipping 563 matching lines @@
                         FX_FLOAT fc[4],
                         const CFX_ByteStringC& csEntry);
 
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry);
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry);
   friend class CPDF_FormControl;
 };
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_