Remove explicit UnownedPtr<>::Get() calls from core/fpdf*/
Bug: pdfium:1898
Change-Id: I1ee00100a86f62ba83a2165839e112be0bf1d7b6
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/100210
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index aa154ae..382d3ee 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -120,9 +120,9 @@
fxcrt::ostringstream* buf = &it->second;
empty_streams.erase(stream_index);
- current_content_marks[stream_index] = ProcessContentMarks(
- buf, pPageObj.Get(), current_content_marks[stream_index]);
- ProcessPageObject(buf, pPageObj.Get());
+ current_content_marks[stream_index] =
+ ProcessContentMarks(buf, pPageObj, current_content_marks[stream_index]);
+ ProcessPageObject(buf, pPageObj);
}
// Finish dirty streams.
@@ -148,9 +148,7 @@
if (new_stream_data.empty())
return;
- CPDF_PageContentManager page_content_manager(m_pObjHolder.Get(),
- m_pDocument.Get());
-
+ CPDF_PageContentManager page_content_manager(m_pObjHolder, m_pDocument);
for (auto& pair : new_stream_data) {
int32_t stream_index = pair.first;
fxcrt::ostringstream* buf = &pair.second;
@@ -183,8 +181,7 @@
if (!m_pObjHolder->GetResources()) {
m_pObjHolder->SetResources(m_pDocument->NewIndirect<CPDF_Dictionary>());
m_pObjHolder->GetMutableDict()->SetNewFor<CPDF_Reference>(
- "Resources", m_pDocument.Get(),
- m_pObjHolder->GetResources()->GetObjNum());
+ "Resources", m_pDocument, m_pObjHolder->GetResources()->GetObjNum());
}
RetainPtr<CPDF_Dictionary> pResList =
@@ -198,7 +195,7 @@
idnum++;
}
- pResList->SetNewFor<CPDF_Reference>(name, m_pDocument.Get(),
+ pResList->SetNewFor<CPDF_Reference>(name, m_pDocument,
pResource->GetObjNum());
return name;
}
@@ -214,8 +211,8 @@
continue;
bDirty = true;
- content_marks = ProcessContentMarks(buf, pPageObj.Get(), content_marks);
- ProcessPageObject(buf, pPageObj.Get());
+ content_marks = ProcessContentMarks(buf, pPageObj, content_marks);
+ ProcessPageObject(buf, pPageObj);
}
FinishMarks(buf, content_marks);
return bDirty;
@@ -327,7 +324,7 @@
ByteString name = RealizeResource(pStream, "XObject");
if (bWasInline) {
- auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
+ auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument);
pImageObj->SetImage(pPageData->GetImage(pStream->GetObjNum()));
}
@@ -550,7 +547,7 @@
WriteMatrix(*buf, pTextObj->GetTextMatrix()) << " Tm ";
RetainPtr<CPDF_Font> pFont(pTextObj->GetFont());
if (!pFont)
- pFont = CPDF_Font::GetStockFont(m_pDocument.Get(), "Helvetica");
+ pFont = CPDF_Font::GetStockFont(m_pDocument, "Helvetica");
FontData data;
const CPDF_FontEncoding* pEncoding = nullptr;
diff --git a/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp b/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
index cc9d5a3..f1e439b 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
@@ -76,12 +76,12 @@
if (contents_stream_) {
auto new_contents_array = indirect_obj_holder_->NewIndirect<CPDF_Array>();
new_contents_array->AppendNew<CPDF_Reference>(
- indirect_obj_holder_.Get(), contents_stream_->GetObjNum());
- new_contents_array->AppendNew<CPDF_Reference>(indirect_obj_holder_.Get(),
+ indirect_obj_holder_, contents_stream_->GetObjNum());
+ new_contents_array->AppendNew<CPDF_Reference>(indirect_obj_holder_,
new_stream->GetObjNum());
RetainPtr<CPDF_Dictionary> page_dict = page_obj_holder_->GetMutableDict();
- page_dict->SetNewFor<CPDF_Reference>("Contents", indirect_obj_holder_.Get(),
+ page_dict->SetNewFor<CPDF_Reference>("Contents", indirect_obj_holder_,
new_contents_array->GetObjNum());
contents_array_ = std::move(new_contents_array);
contents_stream_ = nullptr;
@@ -90,7 +90,7 @@
// If there is an array, just add the new stream to it, at the last position.
if (contents_array_) {
- contents_array_->AppendNew<CPDF_Reference>(indirect_obj_holder_.Get(),
+ contents_array_->AppendNew<CPDF_Reference>(indirect_obj_holder_,
new_stream->GetObjNum());
return contents_array_->size() - 1;
}
@@ -98,7 +98,7 @@
// There were no Contents, so add the new stream as the single Content stream.
// Its index is 0.
RetainPtr<CPDF_Dictionary> page_dict = page_obj_holder_->GetMutableDict();
- page_dict->SetNewFor<CPDF_Reference>("Contents", indirect_obj_holder_.Get(),
+ page_dict->SetNewFor<CPDF_Reference>("Contents", indirect_obj_holder_,
new_stream->GetObjNum());
contents_stream_ = std::move(new_stream);
return 0;
diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp
index e71f956..4276c28 100644
--- a/core/fpdfapi/font/cpdf_cmap.cpp
+++ b/core/fpdfapi/font/cpdf_cmap.cpp
@@ -337,7 +337,7 @@
return static_cast<uint16_t>(charcode);
if (m_pEmbedMap)
- return ::CIDFromCharCode(m_pEmbedMap.Get(), charcode);
+ return ::CIDFromCharCode(m_pEmbedMap, charcode);
if (m_DirectCharcodeToCIDTable.empty())
return static_cast<uint16_t>(charcode);
diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h
index b7fa49b..d201e24 100644
--- a/core/fpdfapi/font/cpdf_cmap.h
+++ b/core/fpdfapi/font/cpdf_cmap.h
@@ -71,7 +71,7 @@
void SetMixedFourByteLeadingRanges(std::vector<CodeRange> ranges);
CIDCoding GetCoding() const { return m_Coding; }
- const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap.Get(); }
+ const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap; }
CIDSet GetCharset() const { return m_Charset; }
void SetCharset(CIDSet set) { m_Charset = set; }
diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
index 56570e5..d1497e5 100644
--- a/core/fpdfapi/font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -126,7 +126,7 @@
// Can return nullptr for stock Type1 fonts. Always returns non-null for other
// font types.
- CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDocument; }
CFX_Font* GetFont() { return &m_Font; }
const CFX_Font* GetFont() const { return &m_Font; }
diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index 1d4f76d..315edc5 100644
--- a/core/fpdfapi/font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -124,7 +124,7 @@
return nullptr;
std::unique_ptr<CPDF_Font::FormIface> pForm = m_pFormFactory->CreateForm(
- m_pDocument.Get(), m_pFontResources ? m_pFontResources : m_pPageResources,
+ m_pDocument, m_pFontResources ? m_pFontResources : m_pPageResources,
pStream);
auto pNewChar = std::make_unique<CPDF_Type3Char>();
diff --git a/core/fpdfapi/page/cpdf_annotcontext.h b/core/fpdfapi/page/cpdf_annotcontext.h
index 9453a48..0b945b1 100644
--- a/core/fpdfapi/page/cpdf_annotcontext.h
+++ b/core/fpdfapi/page/cpdf_annotcontext.h
@@ -31,7 +31,7 @@
const CPDF_Dictionary* GetAnnotDict() const { return m_pAnnotDict.Get(); }
// Never nullptr.
- IPDF_Page* GetPage() const { return m_pPage.Get(); }
+ IPDF_Page* GetPage() const { return m_pPage; }
private:
std::unique_ptr<CPDF_Form> m_pAnnotForm;
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp
index b26ad45..f89829d 100644
--- a/core/fpdfapi/page/cpdf_contentparser.cpp
+++ b/core/fpdfapi/page/cpdf_contentparser.cpp
@@ -208,7 +208,7 @@
m_pParser = std::make_unique<CPDF_StreamContentParser>(
m_pPageObjectHolder->GetDocument(),
m_pPageObjectHolder->GetMutablePageResources(), nullptr, nullptr,
- m_pPageObjectHolder.Get(), m_pPageObjectHolder->GetMutableResources(),
+ m_pPageObjectHolder, m_pPageObjectHolder->GetMutableResources(),
m_pPageObjectHolder->GetBBox(), nullptr, &m_ParsedSet);
m_pParser->GetCurStates()->m_ColorState.SetDefault();
}
diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index cf8baf4..38c4392 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp
@@ -347,7 +347,7 @@
if (!pCSObj)
return false;
- auto* pDocPageData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
+ auto* pDocPageData = CPDF_DocPageData::FromDocument(m_pDocument);
if (pFormResources)
m_pColorSpace = pDocPageData->GetColorSpace(pCSObj.Get(), pFormResources);
if (!m_pColorSpace)
@@ -800,8 +800,7 @@
CPDF_DIB::LoadState CPDF_DIB::StartLoadMaskDIB(
RetainPtr<const CPDF_Stream> mask_stream) {
- m_pMask =
- pdfium::MakeRetain<CPDF_DIB>(m_pDocument.Get(), std::move(mask_stream));
+ m_pMask = pdfium::MakeRetain<CPDF_DIB>(m_pDocument, std::move(mask_stream));
LoadState ret = m_pMask->StartLoadDIBBase(
false, nullptr, nullptr, true, CPDF_ColorSpace::Family::kUnknown, false);
if (ret == LoadState::kContinue) {
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index e73654e..73565dc 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -251,8 +251,8 @@
auto pNewDict = m_pDocument->New<CPDF_Dictionary>();
auto pCTS = m_pDocument->NewIndirect<CPDF_Stream>(std::move(color_table),
std::move(pNewDict));
- pCS->AppendNew<CPDF_Reference>(m_pDocument.Get(), pCTS->GetObjNum());
- pDict->SetNewFor<CPDF_Reference>("ColorSpace", m_pDocument.Get(),
+ pCS->AppendNew<CPDF_Reference>(m_pDocument, pCTS->GetObjNum());
+ pDict->SetNewFor<CPDF_Reference>("ColorSpace", m_pDocument,
pCS->GetObjNum());
} else {
pDict->SetNewFor<CPDF_Name>("ColorSpace", "DeviceGray");
@@ -289,7 +289,7 @@
"Length", pdfium::base::checked_cast<int>(mask_buf.size()));
auto pNewStream = m_pDocument->NewIndirect<CPDF_Stream>(
std::move(mask_buf), std::move(pMaskDict));
- pDict->SetNewFor<CPDF_Reference>("SMask", m_pDocument.Get(),
+ pDict->SetNewFor<CPDF_Reference>("SMask", m_pDocument,
pNewStream->GetObjNum());
}
diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h
index 30f406c..f8d0038 100644
--- a/core/fpdfapi/page/cpdf_image.h
+++ b/core/fpdfapi/page/cpdf_image.h
@@ -36,7 +36,7 @@
RetainPtr<const CPDF_Dictionary> GetDict() const;
RetainPtr<const CPDF_Stream> GetStream() const;
RetainPtr<const CPDF_Dictionary> GetOC() const;
- CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDocument; }
int32_t GetPixelHeight() const { return m_Height; }
int32_t GetPixelWidth() const { return m_Width; }
diff --git a/core/fpdfapi/page/cpdf_occontext.cpp b/core/fpdfapi/page/cpdf_occontext.cpp
index b159118..e4b14aa 100644
--- a/core/fpdfapi/page/cpdf_occontext.cpp
+++ b/core/fpdfapi/page/cpdf_occontext.cpp
@@ -94,8 +94,7 @@
bool CPDF_OCContext::LoadOCGStateFromConfig(
const ByteString& csConfig,
const CPDF_Dictionary* pOCGDict) const {
- RetainPtr<const CPDF_Dictionary> pConfig =
- GetConfig(m_pDocument.Get(), pOCGDict);
+ RetainPtr<const CPDF_Dictionary> pConfig = GetConfig(m_pDocument, pOCGDict);
if (!pConfig)
return true;
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 3c38364..1e0867e 100644
--- a/core/fpdfapi/page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -49,7 +49,7 @@
}
CPDF_Document* CPDF_Page::GetDocument() const {
- return m_pPDFDocument.Get();
+ return m_pPDFDocument;
}
float CPDF_Page::GetPageWidth() const {
diff --git a/core/fpdfapi/page/cpdf_pageimagecache.h b/core/fpdfapi/page/cpdf_pageimagecache.h
index b6dcae8..320fcbe 100644
--- a/core/fpdfapi/page/cpdf_pageimagecache.h
+++ b/core/fpdfapi/page/cpdf_pageimagecache.h
@@ -32,7 +32,7 @@
void ResetBitmapForImage(RetainPtr<CPDF_Image> pImage);
void CacheOptimization(int32_t dwLimitCacheSize);
uint32_t GetTimeCount() const { return m_nTimeCount; }
- CPDF_Page* GetPage() const { return m_pPage.Get(); }
+ CPDF_Page* GetPage() const { return m_pPage; }
bool StartGetCachedBitmap(RetainPtr<CPDF_Image> pImage,
const CPDF_Dictionary* pFormResources,
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h
index e57e812..7c64cca 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -68,7 +68,7 @@
void ContinueParse(PauseIndicatorIface* pPause);
ParseState GetParseState() const { return m_ParseState; }
- CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDocument; }
RetainPtr<const CPDF_Dictionary> GetDict() const { return m_pDict; }
RetainPtr<CPDF_Dictionary> GetMutableDict() { return m_pDict; }
RetainPtr<const CPDF_Dictionary> GetResources() const { return m_pResources; }
diff --git a/core/fpdfapi/page/cpdf_pattern.h b/core/fpdfapi/page/cpdf_pattern.h
index b9fcabc..223eb00 100644
--- a/core/fpdfapi/page/cpdf_pattern.h
+++ b/core/fpdfapi/page/cpdf_pattern.h
@@ -35,7 +35,7 @@
const CFX_Matrix& parentMatrix);
// All the getters that return pointers return non-NULL pointers.
- CPDF_Document* document() const { return m_pDocument.Get(); }
+ CPDF_Document* document() const { return m_pDocument; }
RetainPtr<CPDF_Object> pattern_obj() const { return m_pPatternObj; }
const CFX_Matrix& parent_matrix() const { return m_ParentMatrix; }
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 474c739..3ac7552 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -617,8 +617,7 @@
ByteString key(word.Last(word.GetLength() - 1));
auto pObj = m_pSyntax->ReadNextObject(false, false, 0);
if (pObj && !pObj->IsInline()) {
- pDict->SetNewFor<CPDF_Reference>(key, m_pDocument.Get(),
- pObj->GetObjNum());
+ pDict->SetNewFor<CPDF_Reference>(key, m_pDocument, pObj->GetObjNum());
} else {
pDict->SetFor(key, std::move(pObj));
}
@@ -637,8 +636,8 @@
}
}
pDict->SetNewFor<CPDF_Name>("Subtype", "Image");
- RetainPtr<CPDF_Stream> pStream = m_pSyntax->ReadInlineStream(
- m_pDocument.Get(), std::move(pDict), pCSObj.Get());
+ RetainPtr<CPDF_Stream> pStream =
+ m_pSyntax->ReadInlineStream(m_pDocument, std::move(pDict), pCSObj.Get());
while (true) {
CPDF_StreamParser::ElementType type = m_pSyntax->ParseNextElement();
if (type == CPDF_StreamParser::ElementType::kEndOfData)
@@ -766,10 +765,9 @@
status.m_GraphState = m_pCurStates->m_GraphState;
status.m_ColorState = m_pCurStates->m_ColorState;
status.m_TextState = m_pCurStates->m_TextState;
- auto form =
- std::make_unique<CPDF_Form>(m_pDocument.Get(), m_pPageResources,
- std::move(pStream), m_pResources.Get());
- form->ParseContent(&status, nullptr, m_ParsedSet.Get());
+ auto form = std::make_unique<CPDF_Form>(
+ m_pDocument, m_pPageResources, std::move(pStream), m_pResources.Get());
+ form->ParseContent(&status, nullptr, m_ParsedSet);
CFX_Matrix matrix = m_pCurStates->m_CTM * m_mtContentToUser;
auto pFormObj = std::make_unique<CPDF_FormObject>(GetCurrentStreamIndex(),
@@ -790,15 +788,15 @@
auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
pImageObj->SetImage(
- pdfium::MakeRetain<CPDF_Image>(m_pDocument.Get(), std::move(pStream)));
+ pdfium::MakeRetain<CPDF_Image>(m_pDocument, std::move(pStream)));
return AddImageObject(std::move(pImageObj));
}
CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) {
auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
- pImageObj->SetImage(CPDF_DocPageData::FromDocument(m_pDocument.Get())
- ->GetImage(streamObjNum));
+ pImageObj->SetImage(
+ CPDF_DocPageData::FromDocument(m_pDocument)->GetImage(streamObjNum));
return AddImageObject(std::move(pImageObj));
}
@@ -809,7 +807,7 @@
return nullptr;
auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
- pImageObj->SetImage(CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ pImageObj->SetImage(CPDF_DocPageData::FromDocument(m_pDocument)
->GetImage(pImage->GetStream()->GetObjNum()));
return AddImageObject(std::move(pImageObj));
@@ -1150,10 +1148,9 @@
RetainPtr<CPDF_Dictionary> pFontDict(
ToDictionary(FindResourceObj("Font", name)));
if (!pFontDict) {
- return CPDF_Font::GetStockFont(m_pDocument.Get(),
- CFX_Font::kDefaultAnsiFontName);
+ return CPDF_Font::GetStockFont(m_pDocument, CFX_Font::kDefaultAnsiFontName);
}
- RetainPtr<CPDF_Font> pFont = CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ RetainPtr<CPDF_Font> pFont = CPDF_DocPageData::FromDocument(m_pDocument)
->GetFont(std::move(pFontDict));
if (pFont && pFont->IsType3Font()) {
pFont->AsType3Font()->SetPageResources(m_pResources.Get());
@@ -1182,13 +1179,13 @@
return CPDF_ColorSpace::GetStockCS(CPDF_ColorSpace::Family::kDeviceCMYK);
}
- return CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ return CPDF_DocPageData::FromDocument(m_pDocument)
->GetColorSpace(pDefObj.Get(), nullptr);
}
RetainPtr<const CPDF_Object> pCSObj = FindResourceObj("ColorSpace", name);
if (!pCSObj)
return nullptr;
- return CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ return CPDF_DocPageData::FromDocument(m_pDocument)
->GetColorSpace(pCSObj.Get(), nullptr);
}
@@ -1197,7 +1194,7 @@
RetainPtr<CPDF_Object> pPattern = FindResourceObj("Pattern", name);
if (!pPattern || (!pPattern->IsDictionary() && !pPattern->IsStream()))
return nullptr;
- return CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ return CPDF_DocPageData::FromDocument(m_pDocument)
->GetPattern(std::move(pPattern), m_pCurStates->m_ParentMatrix);
}
@@ -1206,7 +1203,7 @@
RetainPtr<CPDF_Object> pPattern = FindResourceObj("Shading", name);
if (!pPattern || (!pPattern->IsDictionary() && !pPattern->IsStream()))
return nullptr;
- return CPDF_DocPageData::FromDocument(m_pDocument.Get())
+ return CPDF_DocPageData::FromDocument(m_pDocument)
->GetShading(std::move(pPattern), m_pCurStates->m_ParentMatrix);
}
@@ -1518,7 +1515,7 @@
m_StreamStartOffsets = stream_start_offsets;
- ScopedSetInsertion<const uint8_t*> scopedInsert(m_ParsedSet.Get(),
+ ScopedSetInsertion<const uint8_t*> scopedInsert(m_ParsedSet,
pDataStart.data());
uint32_t init_obj_count = m_pObjectHolder->GetPageObjectCount();
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h
index b97bfc0..135ad20 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.h
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.h
@@ -56,9 +56,7 @@
uint32_t start_offset,
uint32_t max_cost,
const std::vector<uint32_t>& stream_start_offsets);
- CPDF_PageObjectHolder* GetPageObjectHolder() const {
- return m_pObjectHolder.Get();
- }
+ CPDF_PageObjectHolder* GetPageObjectHolder() const { return m_pObjectHolder; }
CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
bool IsColored() const { return m_bColored; }
pdfium::span<const float> GetType3Data() const { return m_Type3Data; }
diff --git a/core/fpdfapi/page/cpdf_textstate.cpp b/core/fpdfapi/page/cpdf_textstate.cpp
index b86877d..8044f2b 100644
--- a/core/fpdfapi/page/cpdf_textstate.cpp
+++ b/core/fpdfapi/page/cpdf_textstate.cpp
@@ -97,7 +97,7 @@
m_CTM[i] = that.m_CTM[i];
if (m_pDocument && m_pFont) {
- auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
+ auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument);
m_pFont = pPageData->GetFont(m_pFont->GetMutableFontDict());
}
}
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 1981cdb..40a86c8 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -827,9 +827,9 @@
if (!pPageDict)
return kDataError;
- auto page_num_obj = std::make_pair(
- dwPage, std::make_unique<CPDF_PageObjectAvail>(
- GetValidator(), m_pDocument.Get(), pPageDict));
+ auto page_num_obj =
+ std::make_pair(dwPage, std::make_unique<CPDF_PageObjectAvail>(
+ GetValidator(), m_pDocument, pPageDict));
CPDF_PageObjectAvail* page_obj_avail =
m_PagesObjAvail.insert(std::move(page_num_obj)).first->second.get();
@@ -880,9 +880,9 @@
return kDataError;
{
- auto page_num_obj = std::make_pair(
- dwPage, std::make_unique<CPDF_PageObjectAvail>(
- GetValidator(), m_pDocument.Get(), pPageDict));
+ auto page_num_obj =
+ std::make_pair(dwPage, std::make_unique<CPDF_PageObjectAvail>(
+ GetValidator(), m_pDocument, pPageDict));
CPDF_PageObjectAvail* page_obj_avail =
m_PagesObjAvail.insert(std::move(page_num_obj)).first->second.get();
const DocAvailStatus status = page_obj_avail->CheckAvail();
@@ -913,9 +913,9 @@
CPDF_PageObjectAvail* resource_avail =
m_PagesResourcesAvail
- .insert(std::make_pair(
- resources, std::make_unique<CPDF_PageObjectAvail>(
- GetValidator(), m_pDocument.Get(), resources)))
+ .insert(std::make_pair(resources,
+ std::make_unique<CPDF_PageObjectAvail>(
+ GetValidator(), m_pDocument, resources)))
.first->second.get();
return resource_avail->CheckAvail();
}
@@ -959,8 +959,7 @@
// Page object already can be parsed in document.
if (!m_pDocument->GetIndirectObject(dwObjNum)) {
m_pDocument->ReplaceIndirectObjectIfHigherGeneration(
- dwObjNum,
- ParseIndirectObjectAt(szPageStartPos, dwObjNum, m_pDocument.Get()));
+ dwObjNum, ParseIndirectObjectAt(szPageStartPos, dwObjNum, m_pDocument));
}
if (!ValidatePage(index))
return nullptr;
@@ -995,7 +994,7 @@
return kFormNotExist;
m_pFormAvail = std::make_unique<CPDF_PageObjectAvail>(
- GetValidator(), m_pDocument.Get(), std::move(pAcroForm));
+ GetValidator(), m_pDocument, std::move(pAcroForm));
}
switch (m_pFormAvail->CheckAvail()) {
case kDataError:
@@ -1017,7 +1016,7 @@
if (!pPageDict)
return false;
- CPDF_PageObjectAvail obj_avail(GetValidator(), m_pDocument.Get(),
+ CPDF_PageObjectAvail obj_avail(GetValidator(), m_pDocument,
std::move(pPageDict));
return obj_avail.CheckAvail() == kDataAvailable;
}
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h
index f67ecda..10b0630 100644
--- a/core/fpdfapi/parser/cpdf_document.h
+++ b/core/fpdfapi/parser/cpdf_document.h
@@ -60,7 +60,7 @@
void SetDocument(CPDF_Document* pDoc) { m_pDoc = pDoc; }
protected:
- CPDF_Document* GetDocument() const { return m_pDoc.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDoc; }
private:
UnownedPtr<CPDF_Document> m_pDoc;
@@ -74,7 +74,7 @@
void SetDocument(CPDF_Document* pDoc) { m_pDoc = pDoc; }
protected:
- CPDF_Document* GetDocument() const { return m_pDoc.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDoc; }
private:
UnownedPtr<CPDF_Document> m_pDoc;
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 336c0b0..2b6b86a 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -937,7 +937,7 @@
if (!pObjStream)
return nullptr;
- return pObjStream->ParseObject(m_pObjectsHolder.Get(), objnum,
+ return pObjStream->ParseObject(m_pObjectsHolder, objnum,
info.archive.obj_index);
}
@@ -980,7 +980,7 @@
m_pSyntax->SetPos(pos);
auto result = m_pSyntax->GetIndirectObject(
- m_pObjectsHolder.Get(), CPDF_SyntaxParser::ParseType::kLoose);
+ m_pObjectsHolder, CPDF_SyntaxParser::ParseType::kLoose);
m_pSyntax->SetPos(saved_pos);
if (result && objnum && result->GetObjNum() != objnum)
return nullptr;
@@ -1012,7 +1012,7 @@
if (m_pSyntax->GetKeyword() != "trailer")
return nullptr;
- return ToDictionary(m_pSyntax->GetObjectBody(m_pObjectsHolder.Get()));
+ return ToDictionary(m_pSyntax->GetObjectBody(m_pObjectsHolder));
}
uint32_t CPDF_Parser::GetPermissions() const {
diff --git a/core/fpdfapi/parser/cpdf_reference.cpp b/core/fpdfapi/parser/cpdf_reference.cpp
index 9e22174..d111352 100644
--- a/core/fpdfapi/parser/cpdf_reference.cpp
+++ b/core/fpdfapi/parser/cpdf_reference.cpp
@@ -54,7 +54,7 @@
std::set<const CPDF_Object*>* pVisited) const {
pVisited->insert(this);
if (!bDirect) {
- return pdfium::MakeRetain<CPDF_Reference>(m_pObjList.Get(), m_RefObjNum);
+ return pdfium::MakeRetain<CPDF_Reference>(m_pObjList, m_RefObjNum);
}
RetainPtr<const CPDF_Object> pDirect = GetDirect();
return pDirect && !pdfium::Contains(*pVisited, pDirect.Get())
diff --git a/core/fpdfapi/render/cpdf_devicebuffer.cpp b/core/fpdfapi/render/cpdf_devicebuffer.cpp
index ed11826..3e41927 100644
--- a/core/fpdfapi/render/cpdf_devicebuffer.cpp
+++ b/core/fpdfapi/render/cpdf_devicebuffer.cpp
@@ -84,7 +84,7 @@
auto pBuffer = pdfium::MakeRetain<CFX_DIBitmap>();
m_pDevice->CreateCompatibleBitmap(pBuffer, m_pBitmap->GetWidth(),
m_pBitmap->GetHeight());
- m_pContext->GetBackground(pBuffer, m_pObject.Get(), nullptr, m_Matrix);
+ m_pContext->GetBackground(pBuffer, m_pObject, nullptr, m_Matrix);
pBuffer->CompositeBitmap(0, 0, pBuffer->GetWidth(), pBuffer->GetHeight(),
m_pBitmap, 0, 0, BlendMode::kNormal, nullptr, false);
m_pDevice->StretchDIBits(pBuffer, m_Rect.left, m_Rect.top, m_Rect.Width(),
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index 30cd39e..66ec139 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -93,7 +93,7 @@
return false;
if (!m_pLoader->Start(
- m_pImageObject.Get(), m_pRenderStatus->GetContext()->GetPageCache(),
+ m_pImageObject, m_pRenderStatus->GetContext()->GetPageCache(),
m_pRenderStatus->GetFormResource(),
m_pRenderStatus->GetPageResource(), m_bStdCS,
m_pRenderStatus->GetGroupFamily(), m_pRenderStatus->GetLoadMask())) {
@@ -132,7 +132,7 @@
if (m_pPattern)
m_bPatternColor = true;
}
- m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject.Get());
+ m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject);
} else if (GetRenderOptions().ColorModeIs(CPDF_RenderOptions::kGray)) {
RetainPtr<CFX_DIBitmap> pClone = m_pDIBBase->Realize();
if (!pClone)
@@ -324,11 +324,11 @@
patternDevice.Translate(static_cast<float>(-rect.left),
static_cast<float>(-rect.top));
if (CPDF_TilingPattern* pTilingPattern = m_pPattern->AsTilingPattern()) {
- bitmap_render.DrawTilingPattern(pTilingPattern, m_pImageObject.Get(),
+ bitmap_render.DrawTilingPattern(pTilingPattern, m_pImageObject,
patternDevice, false);
} else if (CPDF_ShadingPattern* pShadingPattern =
m_pPattern->AsShadingPattern()) {
- bitmap_render.DrawShadingPattern(pShadingPattern, m_pImageObject.Get(),
+ bitmap_render.DrawShadingPattern(pShadingPattern, m_pImageObject,
patternDevice, false);
}
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
index c297d07..e8994f1 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
@@ -47,8 +47,8 @@
}
m_pCurrentLayer = m_pContext->GetLayer(m_LayerIndex);
m_LastObjectRendered = m_pCurrentLayer->GetObjectHolder()->end();
- m_pRenderStatus = std::make_unique<CPDF_RenderStatus>(m_pContext.Get(),
- m_pDevice.Get());
+ m_pRenderStatus =
+ std::make_unique<CPDF_RenderStatus>(m_pContext, m_pDevice);
if (m_pOptions)
m_pRenderStatus->SetOptions(*m_pOptions);
m_pRenderStatus->SetTransparency(
diff --git a/core/fpdfapi/render/cpdf_rendercontext.h b/core/fpdfapi/render/cpdf_rendercontext.h
index e61b974..9fe30bb 100644
--- a/core/fpdfapi/render/cpdf_rendercontext.h
+++ b/core/fpdfapi/render/cpdf_rendercontext.h
@@ -31,7 +31,7 @@
Layer(const Layer& that);
~Layer();
- CPDF_PageObjectHolder* GetObjectHolder() { return m_pObjectHolder.Get(); }
+ CPDF_PageObjectHolder* GetObjectHolder() { return m_pObjectHolder; }
const CFX_Matrix& GetMatrix() const { return m_Matrix; }
private:
@@ -60,14 +60,14 @@
size_t CountLayers() const { return m_Layers.size(); }
Layer* GetLayer(uint32_t index) { return &m_Layers[index]; }
- CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
+ CPDF_Document* GetDocument() const { return m_pDocument; }
const CPDF_Dictionary* GetPageResources() const {
return m_pPageResources.Get();
}
RetainPtr<CPDF_Dictionary> GetMutablePageResources() {
return m_pPageResources;
}
- CPDF_PageImageCache* GetPageCache() const { return m_pPageCache.Get(); }
+ CPDF_PageImageCache* GetPageCache() const { return m_pPageCache; }
private:
UnownedPtr<CPDF_Document> const m_pDocument;
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 68da7a6..957616c 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -365,8 +365,7 @@
int res = (pObj->IsImage() && m_bPrint) ? 0 : 300;
CPDF_ScaledRenderBuffer buffer;
- if (!buffer.Initialize(m_pContext.Get(), m_pDevice, rect, pObj, &m_Options,
- res)) {
+ if (!buffer.Initialize(m_pContext, m_pDevice, rect, pObj, &m_Options, res)) {
return;
}
RetainPtr<const CPDF_Dictionary> pFormResource;
@@ -374,7 +373,7 @@
const CPDF_FormObject* pFormObj = pObj->AsForm();
if (pFormObj)
pFormResource = pFormObj->form()->GetDict()->GetDictFor("Resources");
- CPDF_RenderStatus status(m_pContext.Get(), buffer.GetDevice());
+ CPDF_RenderStatus status(m_pContext, buffer.GetDevice());
status.SetOptions(m_Options);
status.SetDeviceMatrix(buffer.GetMatrix());
status.SetTransparency(m_Transparency);
@@ -398,9 +397,9 @@
CFX_Matrix matrix = pFormObj->form_matrix() * mtObj2Device;
RetainPtr<const CPDF_Dictionary> pResources =
pFormObj->form()->GetDict()->GetDictFor("Resources");
- CPDF_RenderStatus status(m_pContext.Get(), m_pDevice);
+ CPDF_RenderStatus status(m_pContext, m_pDevice);
status.SetOptions(m_Options);
- status.SetStopObject(m_pStopObj.Get());
+ status.SetStopObject(m_pStopObj);
status.SetTransparency(m_Transparency);
status.SetDropObjects(m_bDropObjects);
status.SetFormResource(std::move(pResources));
@@ -459,7 +458,7 @@
}
FX_ARGB CPDF_RenderStatus::GetFillArgb(CPDF_PageObject* pObj) const {
- if (Type3CharMissingFillColor(m_pType3Char.Get(), &pObj->m_ColorState))
+ if (Type3CharMissingFillColor(m_pType3Char, &pObj->m_ColorState))
return m_T3FillColor;
return GetFillArgbForType3(pObj);
@@ -493,7 +492,7 @@
FX_ARGB CPDF_RenderStatus::GetStrokeArgb(CPDF_PageObject* pObj) const {
const CPDF_ColorState* pColorState = &pObj->m_ColorState;
- if (Type3CharMissingStrokeColor(m_pType3Char.Get(), pColorState))
+ if (Type3CharMissingStrokeColor(m_pType3Char, pColorState))
return m_T3FillColor;
if (MissingStrokeColor(pColorState))
@@ -706,9 +705,9 @@
nullptr, CFX_FillRenderOptions());
}
}
- CPDF_RenderStatus bitmap_render(m_pContext.Get(), &bitmap_device);
+ CPDF_RenderStatus bitmap_render(m_pContext, &bitmap_device);
bitmap_render.SetOptions(m_Options);
- bitmap_render.SetStopObject(m_pStopObj.Get());
+ bitmap_render.SetStopObject(m_pStopObj);
bitmap_render.SetStdCS(true);
bitmap_render.SetDropObjects(m_bDropObjects);
bitmap_render.SetFormResource(std::move(pFormResource));
@@ -988,7 +987,7 @@
pForm->GetDict()->GetDictFor("Resources");
if (fill_alpha == 255) {
- CPDF_RenderStatus status(m_pContext.Get(), m_pDevice);
+ CPDF_RenderStatus status(m_pContext, m_pDevice);
status.SetOptions(options);
status.SetTransparency(pForm->GetTransparency());
status.SetType3Char(pType3Char);
@@ -1013,7 +1012,7 @@
return true;
}
bitmap_device.GetBitmap()->Clear(0);
- CPDF_RenderStatus status(m_pContext.Get(), &bitmap_device);
+ CPDF_RenderStatus status(m_pContext, &bitmap_device);
status.SetOptions(options);
status.SetTransparency(pForm->GetTransparency());
status.SetType3Char(pType3Char);
@@ -1167,8 +1166,8 @@
int alpha =
FXSYS_roundf(255 * (stroke ? pPageObj->m_GeneralState.GetStrokeAlpha()
: pPageObj->m_GeneralState.GetFillAlpha()));
- CPDF_RenderShading::Draw(m_pDevice, m_pContext.Get(), m_pCurObj.Get(),
- pattern, matrix, rect, alpha, m_Options);
+ CPDF_RenderShading::Draw(m_pDevice, m_pContext, m_pCurObj, pattern, matrix,
+ rect, alpha, m_Options);
}
void CPDF_RenderStatus::ProcessShading(const CPDF_ShadingObject* pShadingObj,
@@ -1179,8 +1178,7 @@
CFX_Matrix matrix = pShadingObj->matrix() * mtObj2Device;
CPDF_RenderShading::Draw(
- m_pDevice, m_pContext.Get(), m_pCurObj.Get(), pShadingObj->pattern(),
- matrix, rect,
+ m_pDevice, m_pContext, m_pCurObj, pShadingObj->pattern(), matrix, rect,
FXSYS_roundf(255 * pShadingObj->m_GeneralState.GetFillAlpha()),
m_Options);
}
@@ -1356,7 +1354,7 @@
FX_RECT bbox = GetClippedBBox(FX_RECT(left, top, left + pDIBitmap->GetWidth(),
top + pDIBitmap->GetHeight()));
RetainPtr<CFX_DIBitmap> pBackdrop = GetBackdrop(
- m_pCurObj.Get(), bbox, blend_mode != BlendMode::kNormal && bIsolated);
+ m_pCurObj, bbox, blend_mode != BlendMode::kNormal && bIsolated);
if (!pBackdrop)
return;
@@ -1432,7 +1430,7 @@
CPDF_RenderOptions options;
options.SetColorMode(bLuminosity ? CPDF_RenderOptions::kNormal
: CPDF_RenderOptions::kAlpha);
- CPDF_RenderStatus status(m_pContext.Get(), &bitmap_device);
+ CPDF_RenderStatus status(m_pContext, &bitmap_device);
status.SetOptions(options);
status.SetGroupFamily(nCSFamily);
status.SetLoadMask(bLuminosity);
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 0ee52a2..36805c4 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -84,7 +84,7 @@
bool GetDropObjects() const { return m_bDropObjects; }
bool IsPrint() const { return m_bPrint; }
bool IsStopped() const { return m_bStopped; }
- CPDF_RenderContext* GetContext() const { return m_pContext.Get(); }
+ CPDF_RenderContext* GetContext() const { return m_pContext; }
const CPDF_Dictionary* GetFormResource() const {
return m_pFormResource.Get();
}
diff --git a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
index 2fdfbf7..099c9be 100644
--- a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
+++ b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
@@ -63,7 +63,8 @@
}
CFX_RenderDevice* CPDF_ScaledRenderBuffer::GetDevice() const {
- return m_pBitmapDevice ? m_pBitmapDevice.get() : m_pDevice.Get();
+ return m_pBitmapDevice ? static_cast<CFX_RenderDevice*>(m_pBitmapDevice.get())
+ : m_pDevice;
}
void CPDF_ScaledRenderBuffer::OutputToDevice() {
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 0e5ca24..78bd204 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -134,7 +134,7 @@
void CPDF_Annot::GenerateAPIfNeeded() {
if (!ShouldGenerateAP())
return;
- if (!CPDF_GenerateAP::GenerateAnnotAP(m_pDocument.Get(), m_pAnnotDict.Get(),
+ if (!CPDF_GenerateAP::GenerateAnnotAP(m_pDocument, m_pAnnotDict.Get(),
m_nSubtype)) {
return;
}
@@ -212,7 +212,7 @@
return it->second.get();
auto pNewForm = std::make_unique<CPDF_Form>(
- m_pDocument.Get(), pPage->GetMutableResources(), pStream);
+ m_pDocument, pPage->GetMutableResources(), pStream);
pNewForm->ParseContent();
CPDF_Form* pResult = pNewForm.get();
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index be45371..9ec5152 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -192,20 +192,19 @@
// provides its own Popup annotations.
continue;
}
- pAnnots->ConvertToIndirectObjectAt(i, m_pDocument.Get());
- m_AnnotList.push_back(
- std::make_unique<CPDF_Annot>(pDict, m_pDocument.Get()));
+ pAnnots->ConvertToIndirectObjectAt(i, m_pDocument);
+ m_AnnotList.push_back(std::make_unique<CPDF_Annot>(pDict, m_pDocument));
if (bRegenerateAP && subtype == "Widget" &&
CPDF_InteractiveForm::IsUpdateAPEnabled() &&
!pDict->GetDictFor(pdfium::annotation::kAP)) {
- GenerateAP(m_pDocument.Get(), pDict.Get());
+ GenerateAP(m_pDocument, pDict.Get());
}
}
m_nAnnotCount = m_AnnotList.size();
for (size_t i = 0; i < m_nAnnotCount; ++i) {
std::unique_ptr<CPDF_Annot> pPopupAnnot =
- CreatePopupAnnot(m_pDocument.Get(), pPage, m_AnnotList[i].get());
+ CreatePopupAnnot(m_pDocument, pPage, m_AnnotList[i].get());
if (pPopupAnnot)
m_AnnotList.push_back(std::move(pPopupAnnot));
}
diff --git a/core/fpdfdoc/cpdf_bafontmap.cpp b/core/fpdfdoc/cpdf_bafontmap.cpp
index 1edb015..e132d5e 100644
--- a/core/fpdfdoc/cpdf_bafontmap.cpp
+++ b/core/fpdfdoc/cpdf_bafontmap.cpp
@@ -212,7 +212,7 @@
if (!ValidateDictType(pElement.Get(), "Font"))
continue;
- auto* pData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
+ auto* pData = CPDF_DocPageData::FromDocument(m_pDocument);
RetainPtr<CPDF_Font> pFont = pData->GetFont(std::move(pElement));
if (!pFont)
continue;
@@ -282,7 +282,7 @@
if (!pFontDict)
return nullptr;
- return CPDF_DocPageData::FromDocument(m_pDocument.Get())->GetFont(pFontDict);
+ return CPDF_DocPageData::FromDocument(m_pDocument)->GetFont(pFontDict);
}
void CPDF_BAFontMap::AddFontToAnnotDict(const RetainPtr<CPDF_Font>& pFont,
@@ -300,7 +300,7 @@
RetainPtr<CPDF_Stream> pStream = pAPDict->GetMutableStreamFor(m_sAPType);
if (!pStream) {
pStream = m_pDocument->NewIndirect<CPDF_Stream>();
- pAPDict->SetNewFor<CPDF_Reference>(m_sAPType, m_pDocument.Get(),
+ pAPDict->SetNewFor<CPDF_Reference>(m_sAPType, m_pDocument,
pStream->GetObjNum());
}
@@ -316,14 +316,14 @@
pStreamResList->GetMutableDictFor("Font");
if (!pStreamResFontList) {
pStreamResFontList = m_pDocument->NewIndirect<CPDF_Dictionary>();
- pStreamResList->SetNewFor<CPDF_Reference>("Font", m_pDocument.Get(),
+ pStreamResList->SetNewFor<CPDF_Reference>("Font", m_pDocument,
pStreamResFontList->GetObjNum());
}
if (!pStreamResFontList->KeyExist(sAlias)) {
RetainPtr<const CPDF_Dictionary> pFontDict = pFont->GetFontDict();
RetainPtr<CPDF_Object> pObject =
pFontDict->IsInline() ? pFontDict->Clone()
- : pFontDict->MakeReference(m_pDocument.Get());
+ : pFontDict->MakeReference(m_pDocument);
pStreamResFontList->SetFor(sAlias, std::move(pObject));
}
}
@@ -412,7 +412,7 @@
}
RetainPtr<CPDF_Font> CPDF_BAFontMap::AddStandardFont(ByteString sFontName) {
- auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
+ auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument);
if (sFontName == "ZapfDingbats")
return pPageData->AddStandardFont(sFontName, nullptr);
@@ -428,5 +428,5 @@
if (nCharset == FX_Charset::kDefault)
nCharset = GetNativeCharset();
- return AddNativeTrueTypeFontToPDF(m_pDocument.Get(), sFontName, nCharset);
+ return AddNativeTrueTypeFontToPDF(m_pDocument, sFontName, nCharset);
}
diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h
index daa5b53..dcfde8c 100644
--- a/core/fpdfdoc/cpdf_formcontrol.h
+++ b/core/fpdfdoc/cpdf_formcontrol.h
@@ -41,7 +41,7 @@
~CPDF_FormControl();
CPDF_FormField::Type GetType() const { return m_pField->GetType(); }
- CPDF_FormField* GetField() const { return m_pField.Get(); }
+ CPDF_FormField* GetField() const { return m_pField; }
RetainPtr<const CPDF_Dictionary> GetWidgetDict() const {
return m_pWidgetDict;
}
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp
index b688345..55a7d8b 100644
--- a/core/fpdfdoc/cpdf_formfield.cpp
+++ b/core/fpdfdoc/cpdf_formfield.cpp
@@ -244,7 +244,7 @@
}
CPDF_FormControl* CPDF_FormField::GetControl(int index) const {
- return GetControls()[index].Get();
+ return GetControls()[index];
}
int CPDF_FormField::GetControlIndex(const CPDF_FormControl* pControl) const {
diff --git a/core/fpdfdoc/cpdf_structelement.h b/core/fpdfdoc/cpdf_structelement.h
index 11e4d75..2247088 100644
--- a/core/fpdfdoc/cpdf_structelement.h
+++ b/core/fpdfdoc/cpdf_structelement.h
@@ -37,7 +37,7 @@
bool UpdateKidIfElement(const CPDF_Dictionary* pDict,
CPDF_StructElement* pElement);
- CPDF_StructElement* GetParent() const { return m_pParentElement.Get(); }
+ CPDF_StructElement* GetParent() const { return m_pParentElement; }
void SetParent(CPDF_StructElement* pParentElement) {
m_pParentElement = pParentElement;
}
diff --git a/core/fpdfdoc/cpvt_fontmap.cpp b/core/fpdfdoc/cpvt_fontmap.cpp
index 3d1bd0f..b0e995c 100644
--- a/core/fpdfdoc/cpvt_fontmap.cpp
+++ b/core/fpdfdoc/cpvt_fontmap.cpp
@@ -34,7 +34,7 @@
return;
RetainPtr<CPDF_Font> pPDFFont =
- CPDF_InteractiveForm::AddNativeInteractiveFormFont(m_pDocument.Get(),
+ CPDF_InteractiveForm::AddNativeInteractiveFormFont(m_pDocument,
&m_sSysFontAlias);
if (!pPDFFont)
return;
@@ -42,7 +42,7 @@
RetainPtr<CPDF_Dictionary> pFontList = m_pResDict->GetMutableDictFor("Font");
if (ValidateFontResourceDict(pFontList.Get()) &&
!pFontList->KeyExist(m_sSysFontAlias)) {
- pFontList->SetNewFor<CPDF_Reference>(m_sSysFontAlias, m_pDocument.Get(),
+ pFontList->SetNewFor<CPDF_Reference>(m_sSysFontAlias, m_pDocument,
pPDFFont->GetFontDictObjNum());
}
m_pSysFont = std::move(pPDFFont);
diff --git a/core/fpdfdoc/cpvt_variabletext.h b/core/fpdfdoc/cpvt_variabletext.h
index 77984b5..4057f89 100644
--- a/core/fpdfdoc/cpvt_variabletext.h
+++ b/core/fpdfdoc/cpvt_variabletext.h
@@ -60,7 +60,7 @@
int32_t nFontIndex);
virtual int32_t GetDefaultFontIndex();
- IPVT_FontMap* GetFontMap() { return m_pFontMap.Get(); }
+ IPVT_FontMap* GetFontMap() { return m_pFontMap; }
private:
UnownedPtr<IPVT_FontMap> const m_pFontMap;
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 64f2a20..5fb6ffc 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -227,7 +227,7 @@
}
CFX_FloatRect GetLooseBounds(const CPDF_TextPage::CharInfo& charinfo) {
- float font_size = GetFontSize(charinfo.m_pTextObj.Get());
+ float font_size = GetFontSize(charinfo.m_pTextObj);
if (charinfo.m_pTextObj && !FXSYS_IsFloatZero(font_size)) {
bool is_vert_writing = charinfo.m_pTextObj->GetFont()->IsVertWriting();
if (is_vert_writing && charinfo.m_pTextObj->GetFont()->IsCIDFont()) {
@@ -368,10 +368,10 @@
continue;
}
if (!text_object)
- text_object = charinfo.m_pTextObj.Get();
+ text_object = charinfo.m_pTextObj;
if (text_object != charinfo.m_pTextObj) {
rects.push_back(rect);
- text_object = charinfo.m_pTextObj.Get();
+ text_object = charinfo.m_pTextObj;
is_new_rect = true;
}
if (is_new_rect) {
@@ -475,7 +475,7 @@
float CPDF_TextPage::GetCharFontSize(size_t index) const {
CHECK(index < m_CharList.size());
- return GetFontSize(m_CharList[index].m_pTextObj.Get());
+ return GetFontSize(m_CharList[index].m_pTextObj);
}
CFX_FloatRect CPDF_TextPage::GetCharLooseBounds(size_t index) const {
@@ -626,7 +626,7 @@
CFX_Matrix matrix;
if (pObj->IsText())
- ProcessTextObject(pObj->AsText(), matrix, m_pPage.Get(), it);
+ ProcessTextObject(pObj->AsText(), matrix, m_pPage, it);
else if (pObj->IsForm())
ProcessFormObject(pObj->AsForm(), matrix);
}
@@ -870,7 +870,7 @@
}
void CPDF_TextPage::ProcessMarkedContent(const TransformedTextObject& obj) {
- const CPDF_TextObject* pTextObj = obj.m_pTextObj.Get();
+ const CPDF_TextObject* pTextObj = obj.m_pTextObj;
const CPDF_ContentMarks* pMarks = pTextObj->GetContentMarks();
const size_t nContentMarks = pMarks->CountItems();
WideString actText;
@@ -935,14 +935,14 @@
}
void CPDF_TextPage::ProcessTextObject(const TransformedTextObject& obj) {
- const CPDF_TextObject* pTextObj = obj.m_pTextObj.Get();
+ const CPDF_TextObject* pTextObj = obj.m_pTextObj;
if (fabs(pTextObj->GetRect().Width()) < kSizeEpsilon)
return;
CFX_Matrix form_matrix = obj.m_formMatrix;
RetainPtr<CPDF_Font> pFont = pTextObj->GetFont();
CFX_Matrix matrix = pTextObj->GetTextMatrix() * form_matrix;
- MarkedContentState ePreMKC = PreMarkedContent(obj.m_pTextObj.Get());
+ MarkedContentState ePreMKC = PreMarkedContent(obj.m_pTextObj);
if (ePreMKC == MarkedContentState::kDone) {
m_pPrevTextObj = pTextObj;
m_PrevMatrix = form_matrix;
@@ -1218,7 +1218,7 @@
FindPreviousTextObject();
TextOrientation WritingMode = GetTextObjectWritingMode(pObj);
if (WritingMode == TextOrientation::kUnknown)
- WritingMode = GetTextObjectWritingMode(m_pPrevTextObj.Get());
+ WritingMode = GetTextObjectWritingMode(m_pPrevTextObj);
size_t nItem = m_pPrevTextObj->CountItems();
if (nItem == 0)
diff --git a/core/fpdftext/cpdf_textpagefind.cpp b/core/fpdftext/cpdf_textpagefind.cpp
index 30e5f94..2e5f828 100644
--- a/core/fpdftext/cpdf_textpagefind.cpp
+++ b/core/fpdftext/cpdf_textpagefind.cpp
@@ -301,8 +301,7 @@
if (m_strText.IsEmpty() || !m_findPreStart.has_value())
return false;
- CPDF_TextPageFind find_engine(m_pTextPage.Get(), m_csFindWhatArray, m_options,
- 0);
+ CPDF_TextPageFind find_engine(m_pTextPage, m_csFindWhatArray, m_options, 0);
if (!find_engine.FindFirst())
return false;
