Rename enum class FPDFText_MarkedContent. Rename it to CPDF_TextPage::MarkedContentState, and rename its values to kFoo to conform to the style guide. Change-Id: I5ff5ba5941caae94486e5d4dc345008de62700ef Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65413 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp index 789b60e..5f2d88e 100644 --- a/core/fpdftext/cpdf_textpage.cpp +++ b/core/fpdftext/cpdf_textpage.cpp
@@ -805,11 +805,12 @@ m_LineObj.insert(m_LineObj.begin(), Obj); } -FPDFText_MarkedContent CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) { +CPDF_TextPage::MarkedContentState CPDF_TextPage::PreMarkedContent( + PDFTEXT_Obj Obj) { CPDF_TextObject* pTextObj = Obj.m_pTextObj.Get(); size_t nContentMarks = pTextObj->m_ContentMarks.CountItems(); if (nContentMarks == 0) - return FPDFText_MarkedContent::Pass; + return MarkedContentState::kPass; WideString actText; bool bExist = false; @@ -826,18 +827,18 @@ } } if (!bExist) - return FPDFText_MarkedContent::Pass; + return MarkedContentState::kPass; if (m_pPreTextObj) { const CPDF_ContentMarks& marks = m_pPreTextObj->m_ContentMarks; if (marks.CountItems() == nContentMarks && marks.GetItem(nContentMarks - 1)->GetParam() == pDict) { - return FPDFText_MarkedContent::Done; + return MarkedContentState::kDone; } } if (actText.IsEmpty()) - return FPDFText_MarkedContent::Pass; + return MarkedContentState::kPass; RetainPtr<CPDF_Font> pFont = pTextObj->GetFont(); bExist = false; @@ -848,7 +849,7 @@ } } if (!bExist) - return FPDFText_MarkedContent::Pass; + return MarkedContentState::kPass; bExist = false; for (size_t i = 0; i < actText.GetLength(); ++i) { @@ -859,9 +860,9 @@ } } if (!bExist) - return FPDFText_MarkedContent::Done; + return MarkedContentState::kDone; - return FPDFText_MarkedContent::Delay; + return MarkedContentState::kDelay; } void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) { @@ -937,8 +938,8 @@ CFX_Matrix formMatrix = Obj.m_formMatrix; RetainPtr<CPDF_Font> pFont = pTextObj->GetFont(); CFX_Matrix matrix = pTextObj->GetTextMatrix() * formMatrix; - FPDFText_MarkedContent ePreMKC = PreMarkedContent(Obj); - if (ePreMKC == FPDFText_MarkedContent::Done) { + MarkedContentState ePreMKC = PreMarkedContent(Obj); + if (ePreMKC == MarkedContentState::kDone) { m_pPreTextObj = pTextObj; m_perMatrix = formMatrix; return; @@ -1001,7 +1002,7 @@ m_CurlineRect = Obj.m_pTextObj->GetRect(); } - if (ePreMKC == FPDFText_MarkedContent::Delay) { + if (ePreMKC == MarkedContentState::kDelay) { ProcessMarkedContent(Obj); m_pPreTextObj = pTextObj; m_perMatrix = formMatrix;
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index 8207f70..a5f3eeb 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h
@@ -36,8 +36,6 @@ #define TEXT_HYPHEN L"-" #define TEXT_CHARRATIO_GAPDELTA 0.070 -enum class FPDFText_MarkedContent { Pass = 0, Done, Delay }; - enum class FPDFText_Direction { Left = -1, Right = 1 }; class PAGECHAR_INFO { @@ -120,6 +118,8 @@ Hyphen, }; + enum class MarkedContentState { kPass = 0, kDone, kDelay }; + bool IsHyphen(wchar_t curChar) const; bool IsControlChar(const PAGECHAR_INFO& charInfo); void ProcessObject(); @@ -139,7 +139,7 @@ CPDF_PageObjectHolder::const_iterator iter); bool IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2); void CloseTempLine(); - FPDFText_MarkedContent PreMarkedContent(PDFTEXT_Obj pObj); + MarkedContentState PreMarkedContent(PDFTEXT_Obj pObj); void ProcessMarkedContent(PDFTEXT_Obj pObj); void FindPreviousTextObject(); void AddCharInfoByLRDirection(wchar_t wChar, const PAGECHAR_INFO& info);