Pass CPDF_Document instead of CPDF_AnnotList when constructing CPDF_Annot.

core/fpdfdoc/include/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_FPDFDOC_INCLUDE_FPDF_DOC_H_
 #define CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_
 
 #include <map>
@@ skipping 302 matching lines @@
 #define ANNOTFLAG_NOROTATE 0x0010
 #define ANNOTFLAG_NOVIEW 0x0020
 #define ANNOTFLAG_READONLY 0x0040
 #define ANNOTFLAG_LOCKED 0x0080
 #define ANNOTFLAG_TOGGLENOVIEW 0x0100
 
 class CPDF_Annot {
  public:
   enum AppearanceMode { Normal, Rollover, Down };
 
-  CPDF_Annot(CPDF_Dictionary* pDict, CPDF_AnnotList* pList);
+  CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument);
   ~CPDF_Annot();
 
   CFX_ByteString GetSubType() const;
   uint32_t GetFlags() const;
   void GetRect(CFX_FloatRect& rect) const;
   const CPDF_Dictionary* GetAnnotDict() const { return m_pAnnotDict; }
   CPDF_Dictionary* GetAnnotDict() { return m_pAnnotDict; }
   FX_BOOL DrawAppearance(CPDF_Page* pPage,
                          CFX_RenderDevice* pDevice,
                          const CFX_Matrix* pUser2Device,
                          AppearanceMode mode,
                          const CPDF_RenderOptions* pOptions);
   FX_BOOL DrawInContext(const CPDF_Page* pPage,
                         CPDF_RenderContext* pContext,
                         const CFX_Matrix* pUser2Device,
                         AppearanceMode mode);
   void ClearCachedAP();
   void DrawBorder(CFX_RenderDevice* pDevice,
                   const CFX_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
   CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
 
  private:
   CPDF_Dictionary* const m_pAnnotDict;
-  CPDF_AnnotList* const m_pList;
+  CPDF_Document* const m_pDocument;
   const CFX_ByteString m_sSubtype;
   std::map<CPDF_Stream*, CPDF_Form*> m_APMap;
 };
 
 class CPDF_AnnotList {
  public:
   explicit CPDF_AnnotList(CPDF_Page* pPage);
   ~CPDF_AnnotList();
 
   void DisplayAnnots(CPDF_Page* pPage,
@@ skipping 12 matching lines @@
                      FX_BOOL bPrinting,
                      CFX_Matrix* pMatrix,
                      uint32_t dwAnnotFlags,
                      CPDF_RenderOptions* pOptions,
                      FX_RECT* pClipRect);
   size_t Count() const { return m_AnnotList.size(); }
   CPDF_Annot* GetAt(size_t index) const { return m_AnnotList[index].get(); }
   const std::vector<std::unique_ptr<CPDF_Annot>>& All() const {
     return m_AnnotList;
   }
-  CPDF_Document* GetDocument() const { return m_pDocument; }
 
  protected:
   void DisplayPass(CPDF_Page* pPage,
                    CFX_RenderDevice* pDevice,
                    CPDF_RenderContext* pContext,
                    FX_BOOL bPrinting,
                    CFX_Matrix* pMatrix,
                    FX_BOOL bWidget,
                    CPDF_RenderOptions* pOptions,
                    FX_RECT* clip_rect);
@@ skipping 538 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteString& csEntry) const;
   CPDF_Stream* GetIcon(const CFX_ByteString& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
                                 CPDF_Annot::AppearanceMode mode);
 
 #endif  // CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_