Make more CPDF_PageObjectHolder members protected.
Change-Id: Id31b9f6ac33971c47cdb378ff7f9ca7d33f899b9
Reviewed-on: https://pdfium-review.googlesource.com/32112
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/fpdfsdk/cpdf_annotcontext.cpp b/fpdfsdk/cpdf_annotcontext.cpp
index d76d5d2..20c5fc3 100644
--- a/fpdfsdk/cpdf_annotcontext.cpp
+++ b/fpdfsdk/cpdf_annotcontext.cpp
@@ -30,6 +30,6 @@
pStream->GetDict()->SetMatrixFor("Matrix", CFX_Matrix());
m_pAnnotForm = pdfium::MakeUnique<CPDF_Form>(
- m_pPage->m_pDocument.Get(), m_pPage->m_pResources.Get(), pStream);
+ m_pPage->GetDocument(), m_pPage->m_pResources.Get(), pStream);
m_pAnnotForm->ParseContent();
}
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 87856fb..08d1b8d 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -211,7 +211,7 @@
#ifdef PDF_ENABLE_XFA
return m_page->GetDocumentExtension()->GetPDFDoc();
#else // PDF_ENABLE_XFA
- return m_page->m_pDocument.Get();
+ return m_page->GetDocument();
#endif // PDF_ENABLE_XFA
}
return nullptr;
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index 17d783f..a21063d 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -47,7 +47,7 @@
return true;
CPDF_Page* pPage = pWidget->GetPDFPage();
- uint32_t dwPermissions = pPage->m_pDocument->GetUserPermissions();
+ uint32_t dwPermissions = pPage->GetDocument()->GetUserPermissions();
return (dwPermissions & FPDFPERM_FILL_FORM) ||
(dwPermissions & FPDFPERM_ANNOT_FORM);
}
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
index 2e11fa8..6b31de7 100644
--- a/fpdfsdk/formfiller/cba_fontmap.cpp
+++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -28,7 +28,7 @@
m_sAPType("N") {
CPDF_Page* pPage = pAnnot->GetPDFPage();
- m_pDocument = pPage->m_pDocument.Get();
+ m_pDocument = pPage->GetDocument();
m_pAnnotDict = pAnnot->GetPDFAnnot()->GetAnnotDict();
Initialize();
}
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 6b34ca3..3db7aa9 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -459,7 +459,7 @@
return false;
CPDF_Page* pPage = pWidget->GetPDFPage();
- uint32_t dwPermissions = pPage->m_pDocument->GetUserPermissions();
+ uint32_t dwPermissions = pPage->GetDocument()->GetUserPermissions();
return (dwPermissions & FPDFPERM_FILL_FORM) ||
(dwPermissions & FPDFPERM_ANNOT_FORM) ||
(dwPermissions & FPDFPERM_MODIFY);
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index 0dbad49..3aca163 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -221,7 +221,7 @@
return nullptr;
auto pDict = pdfium::MakeUnique<CPDF_Dictionary>(
- pPage->m_pDocument->GetByteStringPool());
+ pPage->GetDocument()->GetByteStringPool());
pDict->SetNewFor<CPDF_Name>("Type", "Annot");
pDict->SetNewFor<CPDF_Name>("Subtype",
CPDF_Annot::AnnotSubtypeToString(
@@ -380,7 +380,7 @@
CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(pAnnot->GetAnnotDict(),
CPDF_Annot::AppearanceMode::Normal);
if (!pStream) {
- CPVT_GenerateAP::GenerateEmptyAP(pPage->m_pDocument.Get(), pAnnotDict);
+ CPVT_GenerateAP::GenerateEmptyAP(pPage->GetDocument(), pAnnotDict);
pStream =
FPDFDOC_GetAnnotAP(pAnnotDict, CPDF_Annot::AppearanceMode::Normal);
if (!pStream)
@@ -873,7 +873,7 @@
if (!pAnnotDict)
return FPDF_FORMFLAG_NONE;
- CPDF_InterForm interform(pPage->m_pDocument.Get());
+ CPDF_InterForm interform(pPage->GetDocument());
CPDF_FormField* pFormField = interform.GetFieldByDict(pAnnotDict);
return pFormField ? pFormField->GetFieldFlags() : FPDF_FORMFLAG_NONE;
}
@@ -887,7 +887,7 @@
if (!hHandle || !pPage)
return nullptr;
- CPDF_InterForm interform(pPage->m_pDocument.Get());
+ CPDF_InterForm interform(pPage->GetDocument());
int annot_index = -1;
CPDF_FormControl* pFormCtrl = interform.GetControlAtPoint(
pPage, CFX_PointF(static_cast<float>(page_x), static_cast<float>(page_y)),
diff --git a/fpdfsdk/fpdf_doc.cpp b/fpdfsdk/fpdf_doc.cpp
index 17cfce0..3e8f436 100644
--- a/fpdfsdk/fpdf_doc.cpp
+++ b/fpdfsdk/fpdf_doc.cpp
@@ -54,7 +54,7 @@
if (!page)
return nullptr;
- CPDF_Document* pDoc = page->m_pDocument.Get();
+ CPDF_Document* pDoc = page->GetDocument();
std::unique_ptr<CPDF_LinkList>* pHolder = pDoc->LinksContext();
if (!pHolder->get())
*pHolder = pdfium::MakeUnique<CPDF_LinkList>();
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 9485a75..fed1581 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -305,12 +305,12 @@
metadata->colorspace = FPDF_COLORSPACE_UNKNOWN;
CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
- if (!pPage || !pPage->m_pDocument.Get() || !pImg->GetStream())
+ if (!pPage || !pPage->GetDocument() || !pImg->GetStream())
return true;
auto pSource = pdfium::MakeRetain<CPDF_DIBSource>();
CPDF_DIBSource::LoadState ret = pSource->StartLoadDIBSource(
- pPage->m_pDocument.Get(), pImg->GetStream(), false, nullptr,
+ pPage->GetDocument(), pImg->GetStream(), false, nullptr,
pPage->m_pPageResources.Get());
if (ret == CPDF_DIBSource::LoadState::kFail)
return true;
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index f1d95c7..b8c3f2c 100644
--- a/fpdfsdk/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
@@ -239,7 +239,7 @@
if (!page)
return FLATTEN_FAIL;
- CPDF_Document* pDocument = pPage->m_pDocument.Get();
+ CPDF_Document* pDocument = pPage->GetDocument();
CPDF_Dictionary* pPageDict = pPage->m_pFormDict.Get();
if (!pDocument || !pPageDict)
return FLATTEN_FAIL;
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index c92fc7b..d604bd0 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -184,7 +184,7 @@
pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options, rect);
#else // PDF_ENABLE_XFA
options.SetOCContext(pdfium::MakeRetain<CPDF_OCContext>(
- pPage->m_pDocument.Get(), CPDF_OCContext::View));
+ pPage->GetDocument(), CPDF_OCContext::View));
if (CPDFSDK_PageView* pPageView =
FormHandleToPageView(hHandle, FPDFPageFromUnderlying(pPage)))
pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options);
@@ -207,7 +207,7 @@
return -1;
CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
if (pPage) {
- CPDF_InterForm interform(pPage->m_pDocument.Get());
+ CPDF_InterForm interform(pPage->GetDocument());
CPDF_FormControl* pFormCtrl = interform.GetControlAtPoint(
pPage,
CFX_PointF(static_cast<float>(page_x), static_cast<float>(page_y)),
@@ -269,7 +269,7 @@
CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
if (!pPage)
return -1;
- CPDF_InterForm interform(pPage->m_pDocument.Get());
+ CPDF_InterForm interform(pPage->GetDocument());
int z_order = -1;
(void)interform.GetControlAtPoint(
pPage, CFX_PointF(static_cast<float>(page_x), static_cast<float>(page_y)),
diff --git a/fpdfsdk/fpdf_structtree.cpp b/fpdfsdk/fpdf_structtree.cpp
index 027695e..99fc302 100644
--- a/fpdfsdk/fpdf_structtree.cpp
+++ b/fpdfsdk/fpdf_structtree.cpp
@@ -37,8 +37,7 @@
// Caller takes onwership.
return FPDFStructTreeFromCPDFStructTree(
- CPDF_StructTree::LoadPage(pPage->m_pDocument.Get(),
- pPage->m_pFormDict.Get())
+ CPDF_StructTree::LoadPage(pPage->GetDocument(), pPage->m_pFormDict.Get())
.release());
}
diff --git a/fpdfsdk/fpdf_text.cpp b/fpdfsdk/fpdf_text.cpp
index edca066..a1bbbb4 100644
--- a/fpdfsdk/fpdf_text.cpp
+++ b/fpdfsdk/fpdf_text.cpp
@@ -45,7 +45,7 @@
auto* pContext = static_cast<CPDFXFA_Context*>(pPage->GetDocumentExtension());
CPDF_ViewerPreferences viewRef(pContext->GetPDFDoc());
#else // PDF_ENABLE_XFA
- CPDF_ViewerPreferences viewRef(pPDFPage->m_pDocument.Get());
+ CPDF_ViewerPreferences viewRef(pPDFPage->GetDocument());
#endif // PDF_ENABLE_XFA
CPDF_TextPage* textpage = new CPDF_TextPage(
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index 6706a18..5d4199c 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -126,7 +126,7 @@
if (!pContentObj)
return false;
- CPDF_Document* pDoc = pPage->m_pDocument.Get();
+ CPDF_Document* pDoc = pPage->GetDocument();
if (!pDoc)
return false;
@@ -284,7 +284,7 @@
strClip << "W* n\n";
}
}
- CPDF_Document* pDoc = pPage->m_pDocument.Get();
+ CPDF_Document* pDoc = pPage->GetDocument();
if (!pDoc)
return;
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index f4a7610..919690f 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -111,7 +111,7 @@
const CPDF_OCContext::UsageType usage =
(flags & FPDF_PRINTING) ? CPDF_OCContext::Print : CPDF_OCContext::View;
pContext->m_pOptions->SetOCContext(
- pdfium::MakeRetain<CPDF_OCContext>(pPage->m_pDocument.Get(), usage));
+ pdfium::MakeRetain<CPDF_OCContext>(pPage->GetDocument(), usage));
pContext->m_pDevice->SaveState();
pContext->m_pDevice->SetClip_Rect(clipping_rect);
