UnownedPtrs<> should ideally be const, part 3 Follow-on from https://pdfium-review.googlesource.com/c/pdfium/+/79751 Change-Id: I7e9aba02b7a0d94e87964340f927461eff930627 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/79810 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index 2e7fbc6..c56cfc7 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -1210,7 +1210,7 @@ { auto pText = std::make_unique<CPDF_TextObject>(GetCurrentStreamIndex()); m_pLastTextObject = pText.get(); - SetGraphicStates(m_pLastTextObject.Get(), true, true, true); + SetGraphicStates(pText.get(), true, true, true); if (TextRenderingModeIsStrokeMode(text_mode)) { float* pCTM = pText->m_TextState.GetMutableCTM(); pCTM[0] = m_pCurStates->m_CTM.a;
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h index 66231aa9..51d459e 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.h +++ b/core/fpdfapi/page/cpdf_streamcontentparser.h
@@ -218,7 +218,7 @@ std::unique_ptr<CPDF_AllStates> m_pCurStates; std::stack<std::unique_ptr<CPDF_ContentMarks>> m_ContentMarksStack; std::vector<std::unique_ptr<CPDF_TextObject>> m_ClipTextList; - UnownedPtr<CPDF_TextObject> m_pLastTextObject; + UnownedPtr<const CPDF_TextObject> m_pLastTextObject; std::vector<FX_PATHPOINT> m_PathPoints; float m_PathStartX = 0.0f; float m_PathStartY = 0.0f;
diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp index 932cbec..f256bab 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.cpp +++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp
@@ -45,7 +45,7 @@ // static std::unique_ptr<CPDF_HintTables> CPDF_HintTables::Parse( CPDF_SyntaxParser* parser, - CPDF_LinearizedHeader* pLinearized) { + const CPDF_LinearizedHeader* pLinearized) { DCHECK(parser); if (!pLinearized || pLinearized->GetPageCount() <= 1 || !pLinearized->HasHintTable()) { @@ -76,11 +76,8 @@ } CPDF_HintTables::CPDF_HintTables(CPDF_ReadValidator* pValidator, - CPDF_LinearizedHeader* pLinearized) - : m_pValidator(pValidator), - m_pLinearized(pLinearized), - m_nFirstPageSharedObjs(0), - m_szFirstPageObjOffset(0) { + const CPDF_LinearizedHeader* pLinearized) + : m_pValidator(pValidator), m_pLinearized(pLinearized) { DCHECK(m_pLinearized); }
diff --git a/core/fpdfapi/parser/cpdf_hint_tables.h b/core/fpdfapi/parser/cpdf_hint_tables.h index e3f280f..03aca97 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.h +++ b/core/fpdfapi/parser/cpdf_hint_tables.h
@@ -70,10 +70,10 @@ static std::unique_ptr<CPDF_HintTables> Parse( CPDF_SyntaxParser* parser, - CPDF_LinearizedHeader* pLinearized); + const CPDF_LinearizedHeader* pLinearized); CPDF_HintTables(CPDF_ReadValidator* pValidator, - CPDF_LinearizedHeader* pLinearized); + const CPDF_LinearizedHeader* pLinearized); virtual ~CPDF_HintTables(); bool GetPagePos(uint32_t index, @@ -103,11 +103,10 @@ UnownedPtr<CPDF_ReadValidator> m_pValidator; // Owned by |m_pDataAvail|. - UnownedPtr<CPDF_LinearizedHeader> const m_pLinearized; + UnownedPtr<const CPDF_LinearizedHeader> const m_pLinearized; - uint32_t m_nFirstPageSharedObjs; - FX_FILESIZE m_szFirstPageObjOffset; - + uint32_t m_nFirstPageSharedObjs = 0; + FX_FILESIZE m_szFirstPageObjOffset = 0; std::vector<PageInfo> m_PageInfos; std::vector<SharedObjGroupInfo> m_SharedObjGroupInfos; };
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h index 46296ef..337acff 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.h +++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -186,7 +186,7 @@ CPDF_RenderOptions m_Options; RetainPtr<const CPDF_Dictionary> m_pFormResource; - RetainPtr<CPDF_Dictionary> m_pPageResource; + RetainPtr<const CPDF_Dictionary> m_pPageResource; std::vector<UnownedPtr<const CPDF_Type3Font>> m_Type3FontCache; UnownedPtr<CPDF_RenderContext> const m_pContext; UnownedPtr<CFX_RenderDevice> const m_pDevice;
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp index 7172f68..09dd4d4 100644 --- a/core/fpdftext/cpdf_textpage.cpp +++ b/core/fpdftext/cpdf_textpage.cpp
@@ -370,7 +370,7 @@ count = number_of_chars - start; DCHECK(count > 0); - CPDF_TextObject* text_object = nullptr; + const CPDF_TextObject* text_object = nullptr; CFX_FloatRect rect; int pos = start; bool is_new_rect = true; @@ -893,8 +893,7 @@ } void CPDF_TextPage::ProcessMarkedContent(const TransformedTextObject& obj) { - CPDF_TextObject* pTextObj = obj.m_pTextObj.Get(); - + const CPDF_TextObject* pTextObj = obj.m_pTextObj.Get(); size_t nContentMarks = pTextObj->m_ContentMarks.CountItems(); if (nContentMarks == 0) return; @@ -961,7 +960,7 @@ } void CPDF_TextPage::ProcessTextObject(const TransformedTextObject& obj) { - CPDF_TextObject* const pTextObj = obj.m_pTextObj.Get(); + const CPDF_TextObject* pTextObj = obj.m_pTextObj.Get(); if (fabs(pTextObj->GetRect().Width()) < kSizeEpsilon) return;
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index 9be5604..a03f3fb 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h
@@ -46,7 +46,7 @@ CharType m_CharType = CharType::kNormal; CFX_PointF m_Origin; CFX_FloatRect m_CharBox; - UnownedPtr<CPDF_TextObject> m_pTextObj; + UnownedPtr<const CPDF_TextObject> m_pTextObj; CFX_Matrix m_Matrix; }; @@ -98,7 +98,7 @@ TransformedTextObject(const TransformedTextObject& that); ~TransformedTextObject(); - UnownedPtr<CPDF_TextObject> m_pTextObj; + UnownedPtr<const CPDF_TextObject> m_pTextObj; CFX_Matrix m_formMatrix; }; @@ -141,7 +141,7 @@ std::deque<CharInfo> m_TempCharList; CFX_WideTextBuf m_TextBuf; CFX_WideTextBuf m_TempTextBuf; - UnownedPtr<CPDF_TextObject> m_pPrevTextObj; + UnownedPtr<const CPDF_TextObject> m_pPrevTextObj; CFX_Matrix m_PrevMatrix; const bool m_rtl; const CFX_Matrix m_DisplayMatrix;