Give CFDE_TextOut inner classes shorter names.
- Rename CFDE_TextOut::CFDE_TTOLine to CFDE_TextOut::Line.
- Move FDE_TTOPIECE into CFDE_TextOut, since it is only used inside
CFDE_TextOut, and rename it to CFDE_TextOut::Piece.
Change-Id: I16de481cea271ca7ed84285fe03ddd119af4a16f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70290
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 c9c19a8..15e5592 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -120,11 +120,11 @@
return bRet;
}
-FDE_TTOPIECE::FDE_TTOPIECE() = default;
+CFDE_TextOut::Piece::Piece() = default;
-FDE_TTOPIECE::FDE_TTOPIECE(const FDE_TTOPIECE& that) = default;
+CFDE_TextOut::Piece::Piece(const Piece& that) = default;
-FDE_TTOPIECE::~FDE_TTOPIECE() = default;
+CFDE_TextOut::Piece::~Piece() = default;
CFDE_TextOut::CFDE_TextOut()
: m_pTxtBreak(std::make_unique<CFX_TxtBreak>()), m_ttoLines(5) {}
@@ -300,7 +300,7 @@
for (auto& line : m_ttoLines) {
int32_t iPieces = line.GetSize();
for (int32_t j = 0; j < iPieces; j++) {
- FDE_TTOPIECE* pPiece = line.GetPtrAt(j);
+ Piece* pPiece = line.GetPtrAt(j);
if (!pPiece)
continue;
@@ -391,7 +391,7 @@
if (j == 0 && !bReload) {
m_ttoLines[m_iCurLine].SetNewReload(true);
} else if (j > 0) {
- FDE_TTOPIECE ttoPiece;
+ Piece ttoPiece;
ttoPiece.iStartChar = *pStartChar;
ttoPiece.iChars = j;
ttoPiece.dwCharStyles = pPiece->m_dwCharStyles;
@@ -413,18 +413,18 @@
dwBreakStatus == CFX_BreakType::Paragraph;
}
-void CFDE_TextOut::AppendPiece(const FDE_TTOPIECE& ttoPiece,
+void CFDE_TextOut::AppendPiece(const Piece& ttoPiece,
bool bNeedReload,
bool bEnd) {
if (m_iCurLine >= pdfium::CollectionSize<int32_t>(m_ttoLines)) {
- CFDE_TTOLine ttoLine;
+ Line ttoLine;
ttoLine.SetNewReload(bNeedReload);
m_iCurPiece = ttoLine.AddPiece(m_iCurPiece, ttoPiece);
m_ttoLines.push_back(ttoLine);
m_iCurLine = pdfium::CollectionSize<int32_t>(m_ttoLines) - 1;
} else {
- CFDE_TTOLine* pLine = &m_ttoLines[m_iCurLine];
+ Line* pLine = &m_ttoLines[m_iCurLine];
pLine->SetNewReload(bNeedReload);
m_iCurPiece = pLine->AddPiece(m_iCurPiece, ttoPiece);
@@ -450,9 +450,9 @@
}
}
-void CFDE_TextOut::ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect) {
+void CFDE_TextOut::ReloadLinePiece(Line* pLine, const CFX_RectF& rect) {
pdfium::span<const wchar_t> text_span = m_wsText.span();
- FDE_TTOPIECE* pPiece = pLine->GetPtrAt(0);
+ Piece* pPiece = pLine->GetPtrAt(0);
int32_t iStartChar = pPiece->iStartChar;
int32_t iPieceCount = pLine->GetSize();
int32_t iPieceWidths = 0;
@@ -484,7 +484,7 @@
if (m_ttoLines.empty())
return;
- FDE_TTOPIECE* pFirstPiece = m_ttoLines.back().GetPtrAt(0);
+ Piece* pFirstPiece = m_ttoLines.back().GetPtrAt(0);
if (!pFirstPiece)
return;
@@ -504,7 +504,7 @@
}
}
-size_t CFDE_TextOut::GetDisplayPos(FDE_TTOPIECE* pPiece) {
+size_t CFDE_TextOut::GetDisplayPos(Piece* pPiece) {
ASSERT(pPiece->iChars >= 0);
if (pdfium::CollectionSize<int32_t>(m_CharPos) < pPiece->iChars)
@@ -523,18 +523,16 @@
return m_pTxtBreak->GetDisplayPos(&tr, m_CharPos.data());
}
-CFDE_TextOut::CFDE_TTOLine::CFDE_TTOLine() : m_bNewReload(false) {}
+CFDE_TextOut::Line::Line() : m_bNewReload(false) {}
-CFDE_TextOut::CFDE_TTOLine::CFDE_TTOLine(const CFDE_TTOLine& ttoLine)
- : m_pieces(5) {
+CFDE_TextOut::Line::Line(const Line& ttoLine) : m_pieces(5) {
m_bNewReload = ttoLine.m_bNewReload;
m_pieces = ttoLine.m_pieces;
}
-CFDE_TextOut::CFDE_TTOLine::~CFDE_TTOLine() = default;
+CFDE_TextOut::Line::~Line() = default;
-int32_t CFDE_TextOut::CFDE_TTOLine::AddPiece(int32_t index,
- const FDE_TTOPIECE& ttoPiece) {
+int32_t CFDE_TextOut::Line::AddPiece(int32_t index, const Piece& ttoPiece) {
if (index >= pdfium::CollectionSize<int32_t>(m_pieces)) {
m_pieces.push_back(ttoPiece);
return pdfium::CollectionSize<int32_t>(m_pieces);
@@ -543,15 +541,15 @@
return index;
}
-int32_t CFDE_TextOut::CFDE_TTOLine::GetSize() const {
+int32_t CFDE_TextOut::Line::GetSize() const {
return pdfium::CollectionSize<int32_t>(m_pieces);
}
-FDE_TTOPIECE* CFDE_TextOut::CFDE_TTOLine::GetPtrAt(int32_t index) {
+CFDE_TextOut::Piece* CFDE_TextOut::Line::GetPtrAt(int32_t index) {
return pdfium::IndexInBounds(m_pieces, index) ? &m_pieces[index] : nullptr;
}
-void CFDE_TextOut::CFDE_TTOLine::RemoveLast(int32_t icount) {
+void CFDE_TextOut::Line::RemoveLast(int32_t icount) {
if (icount < 0)
return;
m_pieces.erase(
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h
index bb65d28..4f562b3 100644
--- a/xfa/fde/cfde_textout.h
+++ b/xfa/fde/cfde_textout.h
@@ -22,17 +22,6 @@
class CFX_TxtBreak;
class TextCharPos;
-struct FDE_TTOPIECE {
- FDE_TTOPIECE();
- FDE_TTOPIECE(const FDE_TTOPIECE& that);
- ~FDE_TTOPIECE();
-
- int32_t iStartChar;
- int32_t iChars;
- uint32_t dwCharStyles;
- CFX_RectF rtPiece;
-};
-
class CFDE_TextOut {
public:
static bool DrawString(CFX_RenderDevice* device,
@@ -62,22 +51,33 @@
int32_t GetTotalLines() const { return m_iTotalLines; }
private:
- class CFDE_TTOLine {
+ struct Piece {
+ Piece();
+ Piece(const Piece& that);
+ ~Piece();
+
+ int32_t iStartChar;
+ int32_t iChars;
+ uint32_t dwCharStyles;
+ CFX_RectF rtPiece;
+ };
+
+ class Line {
public:
- CFDE_TTOLine();
- CFDE_TTOLine(const CFDE_TTOLine& ttoLine);
- ~CFDE_TTOLine();
+ Line();
+ Line(const Line& ttoLine);
+ ~Line();
bool GetNewReload() const { return m_bNewReload; }
void SetNewReload(bool reload) { m_bNewReload = reload; }
- int32_t AddPiece(int32_t index, const FDE_TTOPIECE& ttoPiece);
+ int32_t AddPiece(int32_t index, const Piece& ttoPiece);
int32_t GetSize() const;
- FDE_TTOPIECE* GetPtrAt(int32_t index);
+ Piece* GetPtrAt(int32_t index);
void RemoveLast(int32_t iCount);
private:
bool m_bNewReload;
- std::deque<FDE_TTOPIECE> m_pieces;
+ std::deque<Piece> m_pieces;
};
bool RetrieveLineWidth(CFX_BreakType dwBreakStatus,
@@ -87,15 +87,15 @@
void LoadText(const WideString& str, const CFX_RectF& rect);
void Reload(const CFX_RectF& rect);
- void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect);
+ void ReloadLinePiece(Line* pLine, const CFX_RectF& rect);
bool RetrievePieces(CFX_BreakType dwBreakStatus,
bool bReload,
const CFX_RectF& rect,
int32_t* pStartChar,
int32_t* pPieceWidths);
- void AppendPiece(const FDE_TTOPIECE& ttoPiece, bool bNeedReload, bool bEnd);
+ void AppendPiece(const Piece& ttoPiece, bool bNeedReload, bool bEnd);
void DoAlignment(const CFX_RectF& rect);
- size_t GetDisplayPos(FDE_TTOPIECE* pPiece);
+ size_t GetDisplayPos(Piece* pPiece);
std::unique_ptr<CFX_TxtBreak> const m_pTxtBreak;
RetainPtr<CFGAS_GEFont> m_pFont;
@@ -110,7 +110,7 @@
uint32_t m_dwTxtBkStyles = 0;
WideString m_wsText;
CFX_Matrix m_Matrix;
- std::deque<CFDE_TTOLine> m_ttoLines;
+ std::deque<Line> m_ttoLines;
int32_t m_iCurLine = 0;
int32_t m_iCurPiece = 0;
int32_t m_iTotalLines = 0;
