From cc8ae2fd891f71c5d548a042f4d265463887ee6c Mon Sep 17 00:00:00 2001 From: jaepark Date: Wed, 20 Jul 2016 11:20:01 -0700 Subject: Pass CPDF_Document instead of CPDF_AnnotList when constructing CPDF_Annot. CPDF_AnnotList in CPDF_Annot is only used for getting CPDF_Document. Review-Url: https://codereview.chromium.org/2166883002 --- core/fpdfdoc/doc_annot.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfdoc/doc_annot.cpp') diff --git a/core/fpdfdoc/doc_annot.cpp b/core/fpdfdoc/doc_annot.cpp index c9e5d8ea9d..e1a976005b 100644 --- a/core/fpdfdoc/doc_annot.cpp +++ b/core/fpdfdoc/doc_annot.cpp @@ -42,7 +42,7 @@ CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) pDict = pAnnots->GetDictAt(i); } m_AnnotList.push_back( - std::unique_ptr(new CPDF_Annot(pDict, this))); + std::unique_ptr(new CPDF_Annot(pDict, m_pDocument))); if (bRegenerateAP && pDict->GetStringBy("Subtype") == "Widget" && CPDF_InterForm::IsUpdateAPEnabled()) { FPDF_GenerateAP(m_pDocument, pDict); @@ -121,9 +121,9 @@ void CPDF_AnnotList::DisplayAnnots(CPDF_Page* pPage, } } -CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_AnnotList* pList) +CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument) : m_pAnnotDict(pDict), - m_pList(pList), + m_pDocument(pDocument), m_sSubtype(m_pAnnotDict->GetStringBy("Subtype")) {} CPDF_Annot::~CPDF_Annot() { @@ -200,7 +200,7 @@ CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) { return it->second; CPDF_Form* pNewForm = - new CPDF_Form(m_pList->GetDocument(), pPage->m_pResources, pStream); + new CPDF_Form(m_pDocument, pPage->m_pResources, pStream); pNewForm->ParseContent(nullptr, nullptr, nullptr); m_APMap[pStream] = pNewForm; return pNewForm; -- cgit v1.2.3