Remove explicit UnownedPtr<>::Get() calls from fpdfsdk/
See discussion in linked issue.
Bug: pdfium:1898
Change-Id: Ida0330766749442d173e6cc58aa0d57cb1683f69
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/100195
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h
index d930e62..8bf088a 100644
--- a/fpdfsdk/cpdfsdk_annot.h
+++ b/fpdfsdk/cpdfsdk_annot.h
@@ -125,7 +125,7 @@
IPDF_Page* GetXFAPage(); // Returns XFA page or nullptr.
// Never returns nullptr.
- CPDFSDK_PageView* GetPageView() const { return m_pPageView.Get(); }
+ CPDFSDK_PageView* GetPageView() const { return m_pPageView; }
protected:
explicit CPDFSDK_Annot(CPDFSDK_PageView* pPageView);
diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp
index 8cefbb0..eafa236 100644
--- a/fpdfsdk/cpdfsdk_baannot.cpp
+++ b/fpdfsdk/cpdfsdk_baannot.cpp
@@ -42,7 +42,7 @@
}
CPDF_Annot* CPDFSDK_BAAnnot::GetPDFAnnot() const {
- return m_pAnnot.Get();
+ return m_pAnnot;
}
const CPDF_Dictionary* CPDFSDK_BAAnnot::GetAnnotDict() const {
diff --git a/fpdfsdk/cpdfsdk_filewriteadapter.cpp b/fpdfsdk/cpdfsdk_filewriteadapter.cpp
index e697841..f105d22 100644
--- a/fpdfsdk/cpdfsdk_filewriteadapter.cpp
+++ b/fpdfsdk/cpdfsdk_filewriteadapter.cpp
@@ -18,6 +18,6 @@
bool CPDFSDK_FileWriteAdapter::WriteBlock(const void* data, size_t size) {
return file_write_->WriteBlock(
- file_write_.Get(), data,
+ file_write_, data,
pdfium::base::checked_cast<unsigned long>(size)) != 0;
}
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 0178e9c..e127899 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -134,7 +134,7 @@
IPDF_Page* CPDFSDK_FormFillEnvironment::GetCurrentPage() const {
if (m_pInfo && m_pInfo->FFI_GetCurrentPage) {
return IPDFPageFromFPDFPage(m_pInfo->FFI_GetCurrentPage(
- m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get())));
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc)));
}
return nullptr;
}
@@ -464,14 +464,14 @@
if (!m_pInfo || m_pInfo->version < 2 || !m_pInfo->FFI_GetCurrentPageIndex)
return -1;
return m_pInfo->FFI_GetCurrentPageIndex(
- m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()));
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc));
}
void CPDFSDK_FormFillEnvironment::SetCurrentPage(int iCurPage) {
if (!m_pInfo || m_pInfo->version < 2 || !m_pInfo->FFI_SetCurrentPage)
return;
- m_pInfo->FFI_SetCurrentPage(
- m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()), iCurPage);
+ m_pInfo->FFI_SetCurrentPage(m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc),
+ iCurPage);
}
void CPDFSDK_FormFillEnvironment::GotoURL(const WideString& wsURL) {
@@ -479,7 +479,7 @@
return;
ByteString bsTo = wsURL.ToUTF16LE();
- m_pInfo->FFI_GotoURL(m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()),
+ m_pInfo->FFI_GotoURL(m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc),
AsFPDFWideString(&bsTo));
}
@@ -642,7 +642,7 @@
}
void CPDFSDK_FormFillEnvironment::ProcJavascriptAction() {
- auto name_tree = CPDF_NameTree::Create(m_pCPDFDoc.Get(), "JavaScript");
+ auto name_tree = CPDF_NameTree::Create(m_pCPDFDoc, "JavaScript");
if (!name_tree)
return;
@@ -706,7 +706,7 @@
if (!m_pInfo || !m_pInfo->FFI_GetPage)
return nullptr;
return IPDFPageFromFPDFPage(m_pInfo->FFI_GetPage(
- m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()), nIndex));
+ m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc), nIndex));
}
CPDFSDK_InteractiveForm* CPDFSDK_FormFillEnvironment::GetInteractiveForm() {
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index 6c0655f..4c8fc4a 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -107,7 +107,7 @@
int zoomMode,
pdfium::span<float> fPosArray);
- CPDF_Document* GetPDFDocument() const { return m_pCPDFDoc.Get(); }
+ CPDF_Document* GetPDFDocument() const { return m_pCPDFDoc; }
CPDF_Document::Extension* GetDocExtension() const {
return m_pCPDFDoc->GetExtension();
}
diff --git a/fpdfsdk/cpdfsdk_interactiveform.cpp b/fpdfsdk/cpdfsdk_interactiveform.cpp
index 091a019..e659995 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.cpp
+++ b/fpdfsdk/cpdfsdk_interactiveform.cpp
@@ -125,7 +125,7 @@
CPDFSDK_Widget* pWidget = nullptr;
const auto it = m_Map.find(pControl);
if (it != m_Map.end())
- pWidget = it->second.Get();
+ pWidget = it->second;
if (pWidget)
return pWidget;
diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h
index f4fafed..517ac74 100644
--- a/fpdfsdk/cpdfsdk_pageview.h
+++ b/fpdfsdk/cpdfsdk_pageview.h
@@ -62,9 +62,7 @@
CPDF_Page* GetPDFPage() const;
CPDF_Document* GetPDFDocument();
- CPDFSDK_FormFillEnvironment* GetFormFillEnv() const {
- return m_pFormFillEnv.Get();
- }
+ CPDFSDK_FormFillEnvironment* GetFormFillEnv() const { return m_pFormFillEnv; }
WideString GetFocusedFormText();
WideString GetSelectedText();
diff --git a/fpdfsdk/cpdfsdk_pauseadapter.cpp b/fpdfsdk/cpdfsdk_pauseadapter.cpp
index bf3f1c7..fb9da84 100644
--- a/fpdfsdk/cpdfsdk_pauseadapter.cpp
+++ b/fpdfsdk/cpdfsdk_pauseadapter.cpp
@@ -12,5 +12,5 @@
CPDFSDK_PauseAdapter::~CPDFSDK_PauseAdapter() = default;
bool CPDFSDK_PauseAdapter::NeedToPauseNow() {
- return m_IPause->NeedToPauseNow && m_IPause->NeedToPauseNow(m_IPause.Get());
+ return m_IPause->NeedToPauseNow && m_IPause->NeedToPauseNow(m_IPause);
}
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index 2cea0e0..f83c768 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -51,7 +51,7 @@
CPDFSDK_PageView* pPageView = pWidget->GetPageView();
DCHECK(pPageView);
- ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget);
if (m_pFormFiller->OnButtonUp(pObserved, pPageView, nFlags)) {
if (!pObserved)
m_pWidget = nullptr;
@@ -102,7 +102,7 @@
return;
bool bNewChecked = pWnd->IsChecked();
- ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget);
ObservedPtr<CFFL_CheckBox> observed_this(this);
m_pWidget->SetCheck(bNewChecked);
if (!observed_widget)
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index c89a717..d478557 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -96,7 +96,7 @@
m_pWidget->GetSelectedIndex(0);
m_pWidget->SetOptionSelection(nCurSel);
}
- ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget);
ObservedPtr<CFFL_ComboBox> observed_this(this);
m_pWidget->ResetFieldAppearance();
if (!observed_widget)
diff --git a/fpdfsdk/formfiller/cffl_formfield.cpp b/fpdfsdk/formfiller/cffl_formfield.cpp
index c21dca4..fe1e68d 100644
--- a/fpdfsdk/formfiller/cffl_formfield.cpp
+++ b/fpdfsdk/formfiller/cffl_formfield.cpp
@@ -357,7 +357,7 @@
CPWL_Wnd::CreateParams cp = GetCreateParam();
// TODO(tsepez): maybe pass widget's value age as 4th arg.
auto pPrivateData = std::make_unique<CFFL_PerWindowData>(
- m_pWidget.Get(), pPageView, m_pWidget->GetAppearanceAge(), 0);
+ m_pWidget, pPageView, m_pWidget->GetAppearanceAge(), 0);
m_Maps[pPageView] = NewPWLWindow(cp, std::move(pPrivateData));
return m_Maps[pPageView].get();
}
@@ -465,7 +465,7 @@
if (!IsDataChanged(pPageView))
return true;
- ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget);
if (!m_pFormFiller->OnKeyStrokeCommit(pObserved, pPageView, nFlag)) {
if (!pObserved)
return false;
diff --git a/fpdfsdk/formfiller/cffl_formfield.h b/fpdfsdk/formfiller/cffl_formfield.h
index 79c6835..4da34d7 100644
--- a/fpdfsdk/formfiller/cffl_formfield.h
+++ b/fpdfsdk/formfiller/cffl_formfield.h
@@ -132,7 +132,7 @@
CPDFSDK_PageView* GetCurPageView();
void SetChangeMark();
- CPDFSDK_Widget* GetSDKWidget() const { return m_pWidget.Get(); }
+ CPDFSDK_Widget* GetSDKWidget() const { return m_pWidget; }
CFFL_PerWindowData* GetPerPWLWindowData(const CPDFSDK_PageView* pPageView);
void ResetPWLWindowForValueAge(const CPDFSDK_PageView* pPageView,
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 96b4aea..3db3d5a 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -118,7 +118,7 @@
} else {
m_pWidget->SetOptionSelection(pListBox->GetCurSel());
}
- ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget);
ObservedPtr<CFFL_ListBox> observed_this(this);
m_pWidget->SetTopVisibleIndex(nNewTopIndex);
if (!observed_widget)
diff --git a/fpdfsdk/formfiller/cffl_perwindowdata.h b/fpdfsdk/formfiller/cffl_perwindowdata.h
index 40b0b9b..80ee103 100644
--- a/fpdfsdk/formfiller/cffl_perwindowdata.h
+++ b/fpdfsdk/formfiller/cffl_perwindowdata.h
@@ -37,7 +37,7 @@
uint32_t GetValueAge() const { return m_nValueAge; }
void SetFormField(CFFL_FormField* pFormField) { m_pFormField = pFormField; }
- CFFL_FormField* GetFormField() { return m_pFormField.Get(); }
+ CFFL_FormField* GetFormField() { return m_pFormField; }
private:
CFFL_PerWindowData(const CFFL_PerWindowData& that);
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index f5505a4..426edf2 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -51,7 +51,7 @@
CPDFSDK_PageView* pPageView = pWidget->GetPageView();
DCHECK(pPageView);
- ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> pObserved(m_pWidget);
if (m_pFormFiller->OnButtonUp(pObserved, pPageView, nFlags) ||
!pObserved) {
return true;
@@ -95,7 +95,7 @@
return;
bool bNewChecked = pWnd->IsChecked();
- ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget);
ObservedPtr<CFFL_RadioButton> observed_this(this);
m_pWidget->SetCheck(bNewChecked);
if (!observed_widget)
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 4ff64b1..27e884f 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -148,7 +148,7 @@
WideString sOldValue = m_pWidget->GetValue();
WideString sNewValue = pWnd->GetText();
- ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget.Get());
+ ObservedPtr<CPDFSDK_Widget> observed_widget(m_pWidget);
ObservedPtr<CFFL_TextField> observed_this(this);
m_pWidget->SetValue(sNewValue);
if (!observed_widget)
diff --git a/fpdfsdk/fpdf_doc_unittest.cpp b/fpdfsdk/fpdf_doc_unittest.cpp
index 1b3f145..dc42407 100644
--- a/fpdfsdk/fpdf_doc_unittest.cpp
+++ b/fpdfsdk/fpdf_doc_unittest.cpp
@@ -85,25 +85,25 @@
auto bookmarks = CreateDictObjs(3);
bookmarks[1].obj->SetNewFor<CPDF_String>("Title", L"Chapter 1");
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs,
bookmarks[2].num);
bookmarks[2].obj->SetNewFor<CPDF_String>("Title", L"Chapter 2");
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("Prev", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("Prev", m_pIndirectObjs,
bookmarks[1].num);
bookmarks[0].obj->SetNewFor<CPDF_Name>("Type", "Outlines");
bookmarks[0].obj->SetNewFor<CPDF_Number>("Count", 2);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs,
bookmarks[1].num);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs,
bookmarks[2].num);
- m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs.Get(),
+ m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs,
bookmarks[0].num);
// Title with no match.
@@ -129,25 +129,25 @@
auto bookmarks = CreateDictObjs(3);
bookmarks[1].obj->SetNewFor<CPDF_String>("Title", L"Chapter 1");
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs,
bookmarks[2].num);
bookmarks[2].obj->SetNewFor<CPDF_String>("Title", L"Chapter 2");
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[1].num);
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs,
bookmarks[1].num);
bookmarks[0].obj->SetNewFor<CPDF_Name>("Type", "Outlines");
bookmarks[0].obj->SetNewFor<CPDF_Number>("Count", 2);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs,
bookmarks[1].num);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs,
bookmarks[2].num);
- m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs.Get(),
+ m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs,
bookmarks[0].num);
// Title with no match.
@@ -164,31 +164,31 @@
auto bookmarks = CreateDictObjs(4);
bookmarks[1].obj->SetNewFor<CPDF_String>("Title", L"Chapter 1");
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[1].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs.Get(),
+ bookmarks[1].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs,
bookmarks[2].num);
bookmarks[2].obj->SetNewFor<CPDF_String>("Title", L"Chapter 2");
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[2].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs.Get(),
+ bookmarks[2].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs,
bookmarks[3].num);
bookmarks[3].obj->SetNewFor<CPDF_String>("Title", L"Chapter 3");
- bookmarks[3].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs.Get(),
+ bookmarks[3].obj->SetNewFor<CPDF_Reference>("Parent", m_pIndirectObjs,
bookmarks[0].num);
- bookmarks[3].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs.Get(),
+ bookmarks[3].obj->SetNewFor<CPDF_Reference>("Next", m_pIndirectObjs,
bookmarks[1].num);
bookmarks[0].obj->SetNewFor<CPDF_Name>("Type", "Outlines");
bookmarks[0].obj->SetNewFor<CPDF_Number>("Count", 2);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("First", m_pIndirectObjs,
bookmarks[1].num);
- bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs.Get(),
+ bookmarks[0].obj->SetNewFor<CPDF_Reference>("Last", m_pIndirectObjs,
bookmarks[2].num);
- m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs.Get(),
+ m_pRootObj->SetNewFor<CPDF_Reference>("Outlines", m_pIndirectObjs,
bookmarks[0].num);
// Title with no match.
diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index 4232251..832826a 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -219,11 +219,11 @@
bool UpdateReference(RetainPtr<CPDF_Object> pObj);
- CPDF_Document* dest() { return m_pDestDoc.Get(); }
- const CPDF_Document* dest() const { return m_pDestDoc.Get(); }
+ CPDF_Document* dest() { return m_pDestDoc; }
+ const CPDF_Document* dest() const { return m_pDestDoc; }
- CPDF_Document* src() { return m_pSrcDoc.Get(); }
- const CPDF_Document* src() const { return m_pSrcDoc.Get(); }
+ CPDF_Document* src() { return m_pSrcDoc; }
+ const CPDF_Document* src() const { return m_pSrcDoc; }
void AddObjectMapping(uint32_t dwOldPageObj, uint32_t dwNewPageObj) {
m_ObjectNumberMap[dwOldPageObj] = dwNewPageObj;
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 91522c3..8f71908 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -860,7 +860,7 @@
// Ensure external memory is good at least for the duration of this call.
UnownedPtr<uint8_t> pChecker(static_cast<uint8_t*>(first_scan));
auto pBitmap = pdfium::MakeRetain<CFX_DIBitmap>();
- if (!pBitmap->Create(width, height, fx_format, pChecker.Get(), stride))
+ if (!pBitmap->Create(width, height, fx_format, pChecker, stride))
return nullptr;
return FPDFBitmapFromCFXDIBitmap(pBitmap.Leak());
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
index 8e34c09..2b7148e 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp
@@ -145,7 +145,7 @@
return false;
}
- auto stream = CreateXFAMultiStream(m_pPDFDoc.Get());
+ auto stream = CreateXFAMultiStream(m_pPDFDoc);
if (!stream) {
FXSYS_SetLastError(FPDF_ERR_XFALOAD);
return false;
@@ -160,8 +160,8 @@
AutoNuller<cppgc::Persistent<CXFA_FFDoc>> doc_nuller(&m_pXFADoc);
m_pXFADoc = cppgc::MakeGarbageCollected<CXFA_FFDoc>(
- m_pGCHeap->GetAllocationHandle(), m_pXFAApp, m_pDocEnv.get(),
- m_pPDFDoc.Get(), m_pGCHeap.get());
+ m_pGCHeap->GetAllocationHandle(), m_pXFAApp, m_pDocEnv.get(), m_pPDFDoc,
+ m_pGCHeap.get());
if (!m_pXFADoc->OpenDoc(m_pXML.get())) {
FXSYS_SetLastError(FPDF_ERR_XFALOAD);
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index 79589f2..972d06c 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -54,7 +54,7 @@
m_XFAPageList.resize(count);
}
- CPDF_Document* GetPDFDoc() const { return m_pPDFDoc.Get(); }
+ CPDF_Document* GetPDFDoc() const { return m_pPDFDoc; }
CFX_XMLDocument* GetXMLDoc() { return m_pXML.get(); }
CXFA_FFDoc* GetXFADoc() { return m_pXFADoc; }
CXFA_FFDocView* GetXFADocView() const { return m_pXFADocView.Get(); }
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index 2d1a9ae..c419359 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -87,7 +87,7 @@
}
CPDF_Document* CPDFXFA_Page::GetDocument() const {
- return m_pDocument.Get();
+ return m_pDocument;
}
bool CPDFXFA_Page::LoadPDFPage() {
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index 0d13b40..11d3c43 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -25,7 +25,7 @@
std::unique_ptr<IPWL_FillerNotify::PerWindowData> pAttachedData);
~CPWL_ComboBox() override;
- CPWL_Edit* GetEdit() const { return m_pEdit.Get(); }
+ CPWL_Edit* GetEdit() const { return m_pEdit; }
// CPWL_Wnd:
void OnDestroy() override;
diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.cpp b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
index 99ef9dc..a15aac1 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
@@ -551,7 +551,7 @@
void CPWL_ListCtrl::AddItem(const WideString& str) {
auto pListItem = std::make_unique<Item>();
- pListItem->SetFontMap(m_pFontMap.Get());
+ pListItem->SetFontMap(m_pFontMap);
pListItem->SetFontSize(m_fFontSize);
pListItem->SetText(str);
m_ListItems.push_back(std::move(pListItem));
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 4a37278..7eec135 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -78,7 +78,7 @@
void KillFocus() {
ObservedPtr<CPWL_MsgControl> observed_ptr(this);
if (!m_KeyboardPaths.empty()) {
- CPWL_Wnd* pWnd = m_KeyboardPaths.front().Get();
+ CPWL_Wnd* pWnd = m_KeyboardPaths.front();
if (pWnd)
pWnd->OnKillFocus();
}
@@ -473,7 +473,7 @@
}
CPWL_ScrollBar* CPWL_Wnd::GetVScrollBar() const {
- return HasFlag(PWS_VSCROLL) ? m_pVScrollBar.Get() : nullptr;
+ return HasFlag(PWS_VSCROLL) ? m_pVScrollBar : nullptr;
}
void CPWL_Wnd::CreateScrollBar(const CreateParams& cp) {
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index f346e52..8e54186 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -238,10 +238,10 @@
return m_CreationParams.pTimerHandler.Get();
}
IPWL_FillerNotify* GetFillerNotify() const {
- return m_CreationParams.pFillerNotify.Get();
+ return m_CreationParams.pFillerNotify;
}
- CPWL_Wnd* GetParentWindow() const { return m_pParent.Get(); }
+ CPWL_Wnd* GetParentWindow() const { return m_pParent; }
CPWL_ScrollBar* GetVScrollBar() const;
// Returns |true| iff this instance is still allocated.
@@ -266,7 +266,7 @@
CFX_PointF GetCenterPoint() const;
const CFX_FloatRect& GetClipRect() const;
- IPVT_FontMap* GetFontMap() const { return m_CreationParams.pFontMap.Get(); }
+ IPVT_FontMap* GetFontMap() const { return m_CreationParams.pFontMap; }
private:
void DrawChildAppearance(CFX_RenderDevice* pDevice,
