Initialize CFDE_TextOut members in the header. Change-Id: I5213d353bc16930b33e54eae9ebd8a7d29f9f452 Reviewed-on: https://pdfium-review.googlesource.com/c/47337 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp index 18048e5..f7ccafd 100644 --- a/xfa/fde/cfde_textout.cpp +++ b/xfa/fde/cfde_textout.cpp
@@ -122,21 +122,9 @@ FDE_TTOPIECE::~FDE_TTOPIECE() = default; CFDE_TextOut::CFDE_TextOut() - : m_pTxtBreak(pdfium::MakeUnique<CFX_TxtBreak>()), - m_pFont(nullptr), - m_fFontSize(12.0f), - m_fLineSpace(m_fFontSize), - m_fLinePos(0.0f), - m_fTolerance(0.0f), - m_iAlignment(FDE_TextAlignment::kTopLeft), - m_TxtColor(0xFF000000), - m_dwTxtBkStyles(0), - m_ttoLines(5), - m_iCurLine(0), - m_iCurPiece(0), - m_iTotalLines(0) {} + : m_pTxtBreak(pdfium::MakeUnique<CFX_TxtBreak>()), m_ttoLines(5) {} -CFDE_TextOut::~CFDE_TextOut() {} +CFDE_TextOut::~CFDE_TextOut() = default; void CFDE_TextOut::SetFont(const RetainPtr<CFGAS_GEFont>& pFont) { ASSERT(pFont);
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h index 039c682..d20d33b 100644 --- a/xfa/fde/cfde_textout.h +++ b/xfa/fde/cfde_textout.h
@@ -97,23 +97,23 @@ void DoAlignment(const CFX_RectF& rect); size_t GetDisplayPos(FDE_TTOPIECE* pPiece); - std::unique_ptr<CFX_TxtBreak> m_pTxtBreak; + std::unique_ptr<CFX_TxtBreak> const m_pTxtBreak; RetainPtr<CFGAS_GEFont> m_pFont; - float m_fFontSize; - float m_fLineSpace; - float m_fLinePos; - float m_fTolerance; - FDE_TextAlignment m_iAlignment; + float m_fFontSize = 12.0f; + float m_fLineSpace = 12.0f; + float m_fLinePos = 0.0f; + float m_fTolerance = 0.0f; + FDE_TextAlignment m_iAlignment = FDE_TextAlignment::kTopLeft; FDE_TextStyle m_Styles; std::vector<int32_t> m_CharWidths; - FX_ARGB m_TxtColor; - uint32_t m_dwTxtBkStyles; + FX_ARGB m_TxtColor = 0xFF000000; + uint32_t m_dwTxtBkStyles = 0; WideString m_wsText; CFX_Matrix m_Matrix; std::deque<CFDE_TTOLine> m_ttoLines; - int32_t m_iCurLine; - int32_t m_iCurPiece; - int32_t m_iTotalLines; + int32_t m_iCurLine = 0; + int32_t m_iCurPiece = 0; + int32_t m_iTotalLines = 0; std::vector<FXTEXT_CHARPOS> m_CharPos; };