From f3d8573dc0191437be7339e9d5098bfd3e55aafb Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 10 Aug 2017 10:17:13 -0400 Subject: Remove unused FDE_TTOSTYLE_ flags This CL removes the unused FDE_TTOSTYLE_ flags and their supporting code. Change-Id: Ib5ff1af77ceab5a526a845c1fc316a3742ab810a Reviewed-on: https://pdfium-review.googlesource.com/10455 Reviewed-by: Tom Sepez Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fde/cfde_textout.cpp | 183 ++-------------------------------------- xfa/fde/cfde_textout.h | 16 +--- xfa/fwl/theme/cfwl_widgettp.cpp | 1 - 3 files changed, 9 insertions(+), 191 deletions(-) diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp index e796bdcdb3..769a8c4ce5 100644 --- a/xfa/fde/cfde_textout.cpp +++ b/xfa/fde/cfde_textout.cpp @@ -36,8 +36,6 @@ CFDE_TextOut::CFDE_TextOut() m_TxtColor(0xFF000000), m_dwStyles(0), m_dwTxtBkStyles(0), - m_bElliChanged(false), - m_iEllipsisWidth(0), m_ttoLines(5), m_iCurLine(0), m_iCurPiece(0), @@ -79,11 +77,6 @@ void CFDE_TextOut::SetTabWidth(float fTabWidth) { m_pTxtBreak->SetTabWidth(fTabWidth); } -void CFDE_TextOut::SetEllipsisString(const CFX_WideString& wsEllipsis) { - m_bElliChanged = true; - m_wsEllipsis = wsEllipsis; -} - void CFDE_TextOut::SetParagraphBreakChar(wchar_t wch) { m_wParagraphBkChar = wch; m_pTxtBreak->SetParagraphBreakChar(wch); @@ -179,7 +172,6 @@ void CFDE_TextOut::CalcTextSize(const wchar_t* pwsStr, SetLineWidth(rect); m_iTotalLines = 0; const wchar_t* pStr = pwsStr; - bool bHotKey = !!(m_dwStyles & FDE_TTOSTYLE_HotKey); float fWidth = 0.0f; float fHeight = 0.0f; float fStartPos = rect.right(); @@ -193,10 +185,6 @@ void CFDE_TextOut::CalcTextSize(const wchar_t* pwsStr, wBreak = wch; m_pTxtBreak->SetParagraphBreakChar(wch); } - if (bHotKey && wch == L'&' && wPreChar != L'&') { - wPreChar = wch; - continue; - } dwBreakStatus = m_pTxtBreak->AppendChar(wch); if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus)) RetrieveLineWidth(dwBreakStatus, fStartPos, fWidth, fHeight); @@ -328,88 +316,25 @@ void CFDE_TextOut::DrawText(const wchar_t* pwsStr, m_ttoLines.clear(); m_wsText.clear(); LoadText(pwsStr, iLength, rect); - if (m_dwStyles & FDE_TTOSTYLE_Ellipsis) { - ReplaceWidthEllipsis(); - } Reload(rect); DoAlignment(rect); OnDraw(rtClip); } -void CFDE_TextOut::ExpandBuffer(int32_t iSize, int32_t iType) { - ASSERT(iSize >= 0); - size_t size = iSize; - switch (iType) { - case 0: - if (m_CharWidths.size() < size) - m_CharWidths.resize(size, 0); - break; - case 1: - if (m_EllCharWidths.size() < size) - m_EllCharWidths.resize(size, 0); - break; - case 2: - if (m_CharPos.size() < size) - m_CharPos.resize(size, FXTEXT_CHARPOS()); - break; - } -} - -void CFDE_TextOut::LoadEllipsis() { - if (!m_bElliChanged) { - return; - } - m_bElliChanged = false; - m_iEllipsisWidth = 0; - int32_t iLength = m_wsEllipsis.GetLength(); - if (iLength < 1) { - return; - } - ExpandBuffer(iLength, 1); - const wchar_t* pStr = m_wsEllipsis.c_str(); - CFX_BreakType dwBreakStatus; - wchar_t wch; - while (iLength-- > 0) { - wch = *pStr++; - dwBreakStatus = m_pTxtBreak->AppendChar(wch); - if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus)) - RetrieveEllPieces(&m_EllCharWidths); - } - dwBreakStatus = m_pTxtBreak->EndBreak(CFX_BreakType::Paragraph); - if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus)) - RetrieveEllPieces(&m_EllCharWidths); - - m_pTxtBreak->Reset(); -} - -void CFDE_TextOut::RetrieveEllPieces(std::vector* pCharWidths) { - int32_t iCount = m_pTxtBreak->CountBreakPieces(); - int32_t iCharIndex = 0; - for (int32_t i = 0; i < iCount; i++) { - const CFX_BreakPiece* pPiece = m_pTxtBreak->GetBreakPieceUnstable(i); - int32_t iPieceChars = pPiece->GetLength(); - for (int32_t j = 0; j < iPieceChars; j++) { - (*pCharWidths)[iCharIndex] = - std::max(pPiece->GetChar(j)->m_iCharWidth, 0); - m_iEllipsisWidth += (*pCharWidths)[iCharIndex]; - iCharIndex++; - } - } - m_pTxtBreak->ClearBreakPieces(); -} - void CFDE_TextOut::LoadText(const wchar_t* pwsStr, int32_t iLength, const CFX_RectF& rect) { wchar_t* pStr = m_wsText.GetBuffer(iLength); int32_t iTxtLength = iLength; - ExpandBuffer(iTxtLength, 0); - bool bHotKey = !!(m_dwStyles & FDE_TTOSTYLE_HotKey); + + ASSERT(iTxtLength >= 0); + if (pdfium::CollectionSize(m_CharWidths) < iTxtLength) + m_CharWidths.resize(iTxtLength, 0); + bool bLineWrap = !!(m_dwStyles & FDE_TTOSTYLE_LineWrap); float fLineStep = (m_fLineSpace > m_fFontSize) ? m_fLineSpace : m_fFontSize; float fLineStop = rect.bottom(); m_fLinePos = rect.top; - m_HotKeys.clear(); int32_t iStartChar = 0; int32_t iChars = 0; int32_t iPieceWidths = 0; @@ -418,11 +343,6 @@ void CFDE_TextOut::LoadText(const wchar_t* pwsStr, bool bRet = false; while (iTxtLength-- > 0) { wch = *pwsStr++; - if (bHotKey && wch == L'&' && *(pStr - 1) != L'&') { - if (iTxtLength > 0) - m_HotKeys.push_back(iChars); - continue; - } *pStr++ = wch; iChars++; dwBreakStatus = m_pTxtBreak->AppendChar(wch); @@ -534,47 +454,6 @@ void CFDE_TextOut::AppendPiece(const FDE_TTOPIECE& ttoPiece, m_iCurPiece = 0; } -void CFDE_TextOut::ReplaceWidthEllipsis() { - LoadEllipsis(); - int32_t iLength = m_wsEllipsis.GetLength(); - if (iLength < 1) - return; - - for (auto& line : m_ttoLines) { - if (!line.GetNewReload()) - continue; - - int32_t iEllipsisCharIndex = iLength - 1; - int32_t iCharWidth = 0; - int32_t iCharCount = 0; - int32_t iPiece = line.GetSize(); - while (iPiece-- > 0) { - FDE_TTOPIECE* pPiece = line.GetPtrAt(iPiece); - if (!pPiece) - break; - - for (int32_t j = pPiece->iChars - 1; j >= 0; j--) { - if (iEllipsisCharIndex < 0) - break; - - int32_t index = pPiece->iStartChar + j; - iCharWidth += m_CharWidths[index]; - iCharCount++; - if (iCharCount <= iLength) { - m_wsText.SetAt(index, m_wsEllipsis.GetAt(iEllipsisCharIndex)); - m_CharWidths[index] = m_EllCharWidths[iEllipsisCharIndex]; - } else if (iCharWidth <= m_iEllipsisWidth) { - m_wsText.SetAt(index, 0); - m_CharWidths[index] = 0; - } - iEllipsisCharIndex--; - } - if (iEllipsisCharIndex < 0) - break; - } - } -} - void CFDE_TextOut::Reload(const CFX_RectF& rect) { int i = 0; for (auto& line : m_ttoLines) { @@ -665,7 +544,6 @@ void CFDE_TextOut::OnDraw(const CFX_RectF& rtClip) { m_pRenderDevice->DrawString(m_TxtColor, m_pFont, m_CharPos.data(), iCount, m_fFontSize, &m_Matrix); } - DrawLine(pPiece, m_TxtColor); } } m_pRenderDevice->RestoreState(); @@ -673,7 +551,9 @@ void CFDE_TextOut::OnDraw(const CFX_RectF& rtClip) { int32_t CFDE_TextOut::GetDisplayPos(FDE_TTOPIECE* pPiece) { FX_TXTRUN tr = ToTextRun(pPiece); - ExpandBuffer(tr.iLength, 2); + ASSERT(tr.iLength >= 0); + if (pdfium::CollectionSize(m_CharPos) < tr.iLength) + m_CharPos.resize(tr.iLength, FXTEXT_CHARPOS()); return m_pTxtBreak->GetDisplayPos(&tr, m_CharPos.data()); } @@ -697,53 +577,6 @@ FX_TXTRUN CFDE_TextOut::ToTextRun(const FDE_TTOPIECE* pPiece) { return tr; } -void CFDE_TextOut::DrawLine(const FDE_TTOPIECE* pPiece, FX_ARGB color) { - bool bUnderLine = !!(m_dwStyles & FDE_TTOSTYLE_Underline); - bool bStrikeOut = !!(m_dwStyles & FDE_TTOSTYLE_Strikeout); - bool bHotKey = !!(m_dwStyles & FDE_TTOSTYLE_HotKey); - if (!bUnderLine && !bStrikeOut && !bHotKey) - return; - - CFX_PathData path; - int32_t iLineCount = 0; - CFX_RectF rtText = pPiece->rtPiece; - CFX_PointF pt1, pt2; - if (bUnderLine) { - pt1.x = rtText.left; - pt1.y = rtText.bottom(); - pt2.x = rtText.right(); - pt2.y = rtText.bottom(); - path.AppendLine(pt1, pt2); - iLineCount++; - } - if (bStrikeOut) { - pt1.x = rtText.left; - pt1.y = rtText.bottom() - rtText.height * 2.0f / 5.0f; - pt2.x = rtText.right(); - pt2.y = pt1.y; - path.AppendLine(pt1, pt2); - iLineCount++; - } - if (bHotKey) { - if (GetCharRects(pPiece) > 0) { - for (int32_t iCharIndex : m_HotKeys) { - if (iCharIndex >= pPiece->iStartChar && - iCharIndex < pPiece->iStartChar + pPiece->iChars) { - CFX_RectF rect = m_rectArray[iCharIndex - pPiece->iStartChar]; - pt1.x = rect.left; - pt1.y = rect.bottom(); - pt2.x = rect.right(); - pt2.y = rect.bottom(); - path.AppendLine(pt1, pt2); - iLineCount++; - } - } - } - } - if (iLineCount > 0) - m_pRenderDevice->DrawPath(color, 1, path, &m_Matrix); -} - CFDE_TTOLine::CFDE_TTOLine() : m_bNewReload(false) {} CFDE_TTOLine::CFDE_TTOLine(const CFDE_TTOLine& ttoLine) : m_pieces(5) { diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h index 98a7d11cd4..7424573b6b 100644 --- a/xfa/fde/cfde_textout.h +++ b/xfa/fde/cfde_textout.h @@ -17,13 +17,10 @@ #include "core/fxge/fx_dib.h" #include "xfa/fgas/font/cfgas_fontmgr.h" -#define FDE_TTOSTYLE_Underline 0x0001 -#define FDE_TTOSTYLE_Strikeout 0x0002 #define FDE_TTOSTYLE_SingleLine 0x0010 -#define FDE_TTOSTYLE_HotKey 0x0040 -#define FDE_TTOSTYLE_Ellipsis 0x0080 #define FDE_TTOSTYLE_LineWrap 0x0100 #define FDE_TTOSTYLE_LastLineHeight 0x1000 + #define FDE_TTOALIGNMENT_TopLeft 0 #define FDE_TTOALIGNMENT_TopCenter 1 #define FDE_TTOALIGNMENT_TopRight 2 @@ -82,7 +79,6 @@ class CFDE_TextOut { void SetTextColor(FX_ARGB color); void SetStyles(uint32_t dwStyles); void SetTabWidth(float fTabWidth); - void SetEllipsisString(const CFX_WideString& wsEllipsis); void SetParagraphBreakChar(wchar_t wch); void SetAlignment(int32_t iAlignment); void SetLineSpace(float fLineSpace); @@ -119,9 +115,6 @@ class CFDE_TextOut { const CFX_RectF& rect, const CFX_RectF& rtClip); void LoadText(const wchar_t* pwsStr, int32_t iLength, const CFX_RectF& rect); - void LoadEllipsis(); - void ExpandBuffer(int32_t iSize, int32_t iType); - void RetrieveEllPieces(std::vector* pCharWidths); void Reload(const CFX_RectF& rect); void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect); @@ -131,14 +124,12 @@ class CFDE_TextOut { bool bReload, const CFX_RectF& rect); void AppendPiece(const FDE_TTOPIECE& ttoPiece, bool bNeedReload, bool bEnd); - void ReplaceWidthEllipsis(); void DoAlignment(const CFX_RectF& rect); void OnDraw(const CFX_RectF& rtClip); int32_t GetDisplayPos(FDE_TTOPIECE* pPiece); int32_t GetCharRects(const FDE_TTOPIECE* pPiece); FX_TXTRUN ToTextRun(const FDE_TTOPIECE* pPiece); - void DrawLine(const FDE_TTOPIECE* pPiece, FX_ARGB color); std::unique_ptr m_pTxtBreak; CFX_RetainPtr m_pFont; @@ -149,14 +140,10 @@ class CFDE_TextOut { int32_t m_iAlignment; int32_t m_iTxtBkAlignment; std::vector m_CharWidths; - std::vector m_EllCharWidths; wchar_t m_wParagraphBkChar; FX_ARGB m_TxtColor; uint32_t m_dwStyles; uint32_t m_dwTxtBkStyles; - CFX_WideString m_wsEllipsis; - bool m_bElliChanged; - int32_t m_iEllipsisWidth; CFX_WideString m_wsText; CFX_RectF m_rtClip; CFX_RectF m_rtLogicClip; @@ -169,7 +156,6 @@ class CFDE_TextOut { // NOTE: m_pDefaultRenderDevice must outlive m_pRenderDevice. std::unique_ptr m_pDefaultRenderDevice; std::unique_ptr m_pRenderDevice; - std::vector m_HotKeys; std::vector m_rectArray; }; diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index e863a0e0d3..bf5fd42736 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -89,7 +89,6 @@ void CFWL_WidgetTP::InitTTO() { m_pTextOut->SetFont(m_pFDEFont); m_pTextOut->SetFontSize(FWLTHEME_CAPACITY_FontSize); m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor); - m_pTextOut->SetEllipsisString(L"..."); } void CFWL_WidgetTP::FinalizeTTO() { -- cgit v1.2.3