Remove remaining CFX_ types from fgas/
No more files to move, but a few remaining types to rename.
-- Nest one type where appropriate
-- Initialize in header in one place
-- Pack one class tighter
Fixed: pdfium:1567
Change-Id: I1167a9444f188522bf61263b54e3172d4b3b0d5e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/78712
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 5b4f12b..93f5b32 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -502,7 +502,7 @@
return pFace;
}
-bool VerifyUnicodeForFontDescriptor(CFX_FontDescriptor* pDesc,
+bool VerifyUnicodeForFontDescriptor(CFGAS_FontDescriptor* pDesc,
wchar_t wcUnicode) {
RetainPtr<IFX_SeekableReadStream> pFileRead =
CreateFontStream(pDesc->m_wsFaceName.ToUTF8());
@@ -527,7 +527,7 @@
return name1.Contains(name2.AsStringView());
}
-int32_t CalcPenalty(CFX_FontDescriptor* pInstalled,
+int32_t CalcPenalty(CFGAS_FontDescriptor* pInstalled,
uint16_t wCodePage,
uint32_t dwFontStyles,
const WideString& FontName,
@@ -599,10 +599,10 @@
} // namespace
-CFX_FontDescriptor::CFX_FontDescriptor()
+CFGAS_FontDescriptor::CFGAS_FontDescriptor()
: m_nFaceIndex(0), m_dwFontStyles(0), m_dwUsb(), m_dwCsb() {}
-CFX_FontDescriptor::~CFX_FontDescriptor() = default;
+CFGAS_FontDescriptor::~CFGAS_FontDescriptor() = default;
CFGAS_FontMgr::CFGAS_FontMgr() = default;
@@ -638,17 +638,17 @@
uint32_t dwHash,
uint16_t wCodePage,
uint16_t /* wBitField */) {
- std::vector<CFX_FontDescriptorInfo>* sortedFontInfos =
+ std::vector<CFGAS_FontDescriptorInfo>* sortedFontInfos =
m_Hash2CandidateList[dwHash].get();
if (!sortedFontInfos) {
- auto pNewFonts = std::make_unique<std::vector<CFX_FontDescriptorInfo>>();
+ auto pNewFonts = std::make_unique<std::vector<CFGAS_FontDescriptorInfo>>();
sortedFontInfos = pNewFonts.get();
MatchFonts(sortedFontInfos, wCodePage, dwFontStyles,
WideString(pszFontFamily), wUnicode);
m_Hash2CandidateList[dwHash] = std::move(pNewFonts);
}
for (const auto& info : *sortedFontInfos) {
- CFX_FontDescriptor* pDesc = info.pFont;
+ CFGAS_FontDescriptor* pDesc = info.pFont;
if (!VerifyUnicodeForFontDescriptor(pDesc, wUnicode))
continue;
RetainPtr<CFGAS_GEFont> pFont =
@@ -680,7 +680,7 @@
}
void CFGAS_FontMgr::MatchFonts(
- std::vector<CFX_FontDescriptorInfo>* pMatchedFonts,
+ std::vector<CFGAS_FontDescriptorInfo>* pMatchedFonts,
uint16_t wCodePage,
uint32_t dwFontStyles,
const WideString& FontName,
@@ -703,7 +703,7 @@
if ((pFace->GetRec()->face_flags & FT_FACE_FLAG_SCALABLE) == 0)
return;
- auto pFont = std::make_unique<CFX_FontDescriptor>();
+ auto pFont = std::make_unique<CFGAS_FontDescriptor>();
pFont->m_dwFontStyles |= GetFlags(pFace->GetRec());
GetUSBCSB(pFace->GetRec(), pFont->m_dwUsb, pFont->m_dwCsb);
@@ -780,10 +780,10 @@
RetainPtr<CFGAS_GEFont> pFont =
CFGAS_GEFont::LoadFont(pFD->wsFontFace, dwFontStyles, wCodePage);
#else // defined(OS_WIN)
- std::vector<CFX_FontDescriptorInfo>* sortedFontInfos =
+ std::vector<CFGAS_FontDescriptorInfo>* sortedFontInfos =
m_Hash2CandidateList[dwHash].get();
if (!sortedFontInfos) {
- auto pNewFonts = std::make_unique<std::vector<CFX_FontDescriptorInfo>>();
+ auto pNewFonts = std::make_unique<std::vector<CFGAS_FontDescriptorInfo>>();
sortedFontInfos = pNewFonts.get();
MatchFonts(sortedFontInfos, wCodePage, dwFontStyles,
WideString(pszFontFamily), 0);
@@ -792,7 +792,7 @@
if (sortedFontInfos->empty())
return nullptr;
- CFX_FontDescriptor* pDesc = (*sortedFontInfos)[0].pFont;
+ CFGAS_FontDescriptor* pDesc = (*sortedFontInfos)[0].pFont;
RetainPtr<CFGAS_GEFont> pFont =
LoadFontInternal(pDesc->m_wsFaceName, pDesc->m_nFaceIndex);
#endif // defined(OS_WIN)
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 6010a69..995ca95 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -62,10 +62,10 @@
#else // defined(OS_WIN)
-class CFX_FontDescriptor {
+class CFGAS_FontDescriptor {
public:
- CFX_FontDescriptor();
- ~CFX_FontDescriptor();
+ CFGAS_FontDescriptor();
+ ~CFGAS_FontDescriptor();
int32_t m_nFaceIndex;
uint32_t m_dwFontStyles;
@@ -75,18 +75,18 @@
uint32_t m_dwCsb[2];
};
-class CFX_FontDescriptorInfo {
+class CFGAS_FontDescriptorInfo {
public:
- CFX_FontDescriptor* pFont;
+ CFGAS_FontDescriptor* pFont;
int32_t nPenalty;
- bool operator>(const CFX_FontDescriptorInfo& other) const {
+ bool operator>(const CFGAS_FontDescriptorInfo& other) const {
return nPenalty > other.nPenalty;
}
- bool operator<(const CFX_FontDescriptorInfo& other) const {
+ bool operator<(const CFGAS_FontDescriptorInfo& other) const {
return nPenalty < other.nPenalty;
}
- bool operator==(const CFX_FontDescriptorInfo& other) const {
+ bool operator==(const CFGAS_FontDescriptorInfo& other) const {
return nPenalty == other.nPenalty;
}
};
@@ -131,7 +131,7 @@
void RegisterFace(RetainPtr<CFX_Face> pFace, const WideString* pFaceName);
void RegisterFaces(const RetainPtr<IFX_SeekableReadStream>& pFontStream,
const WideString* pFaceName);
- void MatchFonts(std::vector<CFX_FontDescriptorInfo>* MatchedFonts,
+ void MatchFonts(std::vector<CFGAS_FontDescriptorInfo>* MatchedFonts,
uint16_t wCodePage,
uint32_t dwFontStyles,
const WideString& FontName,
@@ -146,8 +146,8 @@
#if defined(OS_WIN)
std::deque<FX_FONTDESCRIPTOR> m_FontFaces;
#else
- std::vector<std::unique_ptr<CFX_FontDescriptor>> m_InstalledFonts;
- std::map<uint32_t, std::unique_ptr<std::vector<CFX_FontDescriptorInfo>>>
+ std::vector<std::unique_ptr<CFGAS_FontDescriptor>> m_InstalledFonts;
+ std::map<uint32_t, std::unique_ptr<std::vector<CFGAS_FontDescriptorInfo>>>
m_Hash2CandidateList;
#endif // defined(OS_WIN)
};
diff --git a/xfa/fgas/layout/cfgas_rtfbreak.cpp b/xfa/fgas/layout/cfgas_rtfbreak.cpp
index d444826..97096b6 100644
--- a/xfa/fgas/layout/cfgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfgas_rtfbreak.cpp
@@ -24,9 +24,7 @@
#include "xfa/fgas/layout/fx_linebreak.h"
CFGAS_RTFBreak::CFGAS_RTFBreak(uint32_t dwLayoutStyles)
- : CFGAS_Break(dwLayoutStyles),
- m_bPagination(false),
- m_iAlignment(CFX_RTFLineAlignment::Left) {
+ : CFGAS_Break(dwLayoutStyles) {
SetBreakStatus();
m_bPagination = !!(m_dwLayoutStyles & FX_LAYOUTSTYLE_Pagination);
}
@@ -331,13 +329,13 @@
m_iReadyLineIndex = m_pCurLine == &m_Lines[0] ? 0 : 1;
CFGAS_BreakLine* pNextLine = &m_Lines[1 - m_iReadyLineIndex];
- bool bAllChars = m_iAlignment == CFX_RTFLineAlignment::Justified ||
- m_iAlignment == CFX_RTFLineAlignment::Distributed;
+ bool bAllChars = m_iAlignment == LineAlignment::Justified ||
+ m_iAlignment == LineAlignment::Distributed;
if (!EndBreak_SplitLine(pNextLine, bAllChars, dwStatus)) {
std::deque<FX_TPO> tpos;
EndBreak_BidiLine(&tpos, dwStatus);
- if (!m_bPagination && m_iAlignment != CFX_RTFLineAlignment::Left)
+ if (!m_bPagination && m_iAlignment != LineAlignment::Left)
EndBreak_Alignment(tpos, bAllChars, dwStatus);
}
m_pCurLine = pNextLine;
@@ -548,8 +546,8 @@
}
int32_t iOffset = m_iLineWidth - iNetWidth;
- if (iGapChars > 0 && (m_iAlignment == CFX_RTFLineAlignment::Distributed ||
- (m_iAlignment == CFX_RTFLineAlignment::Justified &&
+ if (iGapChars > 0 && (m_iAlignment == LineAlignment::Distributed ||
+ (m_iAlignment == LineAlignment::Justified &&
dwStatus != CFGAS_Char::BreakType::kParagraph))) {
int32_t iStart = -1;
for (const auto& tpo : tpos) {
@@ -575,9 +573,9 @@
}
iStart += ttp.m_iWidth;
}
- } else if (m_iAlignment == CFX_RTFLineAlignment::Right ||
- m_iAlignment == CFX_RTFLineAlignment::Center) {
- if (m_iAlignment == CFX_RTFLineAlignment::Center)
+ } else if (m_iAlignment == LineAlignment::Right ||
+ m_iAlignment == LineAlignment::Center) {
+ if (m_iAlignment == LineAlignment::Center)
iOffset /= 2;
if (iOffset > 0) {
for (auto& ttp : m_pCurLine->m_LinePieces)
diff --git a/xfa/fgas/layout/cfgas_rtfbreak.h b/xfa/fgas/layout/cfgas_rtfbreak.h
index 4015638..22cd0d9 100644
--- a/xfa/fgas/layout/cfgas_rtfbreak.h
+++ b/xfa/fgas/layout/cfgas_rtfbreak.h
@@ -19,22 +19,22 @@
class CFGAS_TextUserData;
class TextCharPos;
-enum class CFX_RTFLineAlignment {
- Left = 0,
- Center,
- Right,
- Justified,
- Distributed
-};
-
class CFGAS_RTFBreak final : public CFGAS_Break {
public:
+ enum class LineAlignment : uint8_t {
+ Left = 0,
+ Center,
+ Right,
+ Justified,
+ Distributed
+ };
+
explicit CFGAS_RTFBreak(uint32_t dwLayoutStyles);
~CFGAS_RTFBreak() override;
void SetLineStartPos(float fLinePos);
- void SetAlignment(CFX_RTFLineAlignment align) { m_iAlignment = align; }
+ void SetAlignment(LineAlignment align) { m_iAlignment = align; }
void SetUserData(const RetainPtr<CFGAS_TextUserData>& pUserData);
void AddPositionedTab(float fTabPos);
@@ -70,9 +70,9 @@
bool bAllChars,
CFGAS_Char::BreakType dwStatus);
- bool m_bPagination;
+ bool m_bPagination = false;
+ LineAlignment m_iAlignment = LineAlignment::Left;
std::vector<int32_t> m_PositionedTabs;
- CFX_RTFLineAlignment m_iAlignment;
RetainPtr<CFGAS_TextUserData> m_pUserData;
};
diff --git a/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
index 4d0843f..937a799 100644
--- a/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfgas_rtfbreak_unittest.cpp
@@ -16,7 +16,7 @@
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/layout/cfgas_char.h"
-class CFX_RTFBreakTest : public testing::Test {
+class CFGAS_RTFBreakTest : public testing::Test {
public:
void SetUp() override {
font_ = CFGAS_GEFont::LoadFont(L"Arial Black", 0, 0);
@@ -36,7 +36,7 @@
// As soon as you get one of the control characters the break is complete
// and must be consumed before you get any more characters ....
-TEST_F(CFX_RTFBreakTest, AddChars) {
+TEST_F(CFGAS_RTFBreakTest, AddChars) {
auto rtf_break = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
WideString str(L"Input String.");
@@ -61,7 +61,7 @@
EXPECT_EQ(str, rtf_break->GetBreakPieceUnstable(0)->GetString());
}
-TEST_F(CFX_RTFBreakTest, ControlCharacters) {
+TEST_F(CFGAS_RTFBreakTest, ControlCharacters) {
auto rtf_break = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
EXPECT_EQ(CFGAS_Char::BreakType::kLine, rtf_break->AppendChar(L'\v'));
EXPECT_EQ(CFGAS_Char::BreakType::kPage, rtf_break->AppendChar(L'\f'));
@@ -74,7 +74,7 @@
EXPECT_EQ(L"\v", rtf_break->GetBreakPieceUnstable(0)->GetString());
}
-TEST_F(CFX_RTFBreakTest, BidiLine) {
+TEST_F(CFGAS_RTFBreakTest, BidiLine) {
auto rtf_break = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
rtf_break->SetLineBreakTolerance(1);
rtf_break->SetFontSize(12);
diff --git a/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp b/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
index f320a49..4d64b9a 100644
--- a/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfgas_txtbreak_unittest.cpp
@@ -13,7 +13,7 @@
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/layout/cfgas_char.h"
-class CFX_TxtBreakTest : public testing::Test {
+class CFGAS_TxtBreakTest : public testing::Test {
public:
void SetUp() override {
font_ = CFGAS_GEFont::LoadFont(L"Arial Black", 0, 0);
@@ -30,7 +30,7 @@
RetainPtr<CFGAS_GEFont> font_;
};
-TEST_F(CFX_TxtBreakTest, BidiLine) {
+TEST_F(CFGAS_TxtBreakTest, BidiLine) {
auto txt_break = CreateBreak();
txt_break->SetLineBreakTolerance(1);
txt_break->SetFontSize(12);
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
index 7af6cb8..02af8bb 100644
--- a/xfa/fxfa/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -163,19 +163,19 @@
float fStart = 0;
float fStartPos = 0;
if (para) {
- CFX_RTFLineAlignment iAlign = CFX_RTFLineAlignment::Left;
+ CFGAS_RTFBreak::LineAlignment iAlign = CFGAS_RTFBreak::LineAlignment::Left;
switch (para->GetHorizontalAlign()) {
case XFA_AttributeValue::Center:
- iAlign = CFX_RTFLineAlignment::Center;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Center;
break;
case XFA_AttributeValue::Right:
- iAlign = CFX_RTFLineAlignment::Right;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Right;
break;
case XFA_AttributeValue::Justify:
- iAlign = CFX_RTFLineAlignment::Justified;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Justified;
break;
case XFA_AttributeValue::JustifyAll:
- iAlign = CFX_RTFLineAlignment::Distributed;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Distributed;
break;
case XFA_AttributeValue::Left:
case XFA_AttributeValue::Radix:
@@ -188,7 +188,7 @@
fStart = para->GetMarginLeft();
if (m_pTextProvider->IsCheckButtonAndAutoWidth()) {
- if (iAlign != CFX_RTFLineAlignment::Left)
+ if (iAlign != CFGAS_RTFBreak::LineAlignment::Left)
fLineWidth -= para->GetMarginRight();
} else {
fLineWidth -= para->GetMarginRight();
@@ -232,19 +232,19 @@
if (eDisplay == CFX_CSSDisplay::Block ||
eDisplay == CFX_CSSDisplay::ListItem) {
- CFX_RTFLineAlignment iAlign = CFX_RTFLineAlignment::Left;
+ CFGAS_RTFBreak::LineAlignment iAlign = CFGAS_RTFBreak::LineAlignment::Left;
switch (pStyle->GetTextAlign()) {
case CFX_CSSTextAlign::Right:
- iAlign = CFX_RTFLineAlignment::Right;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Right;
break;
case CFX_CSSTextAlign::Center:
- iAlign = CFX_RTFLineAlignment::Center;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Center;
break;
case CFX_CSSTextAlign::Justify:
- iAlign = CFX_RTFLineAlignment::Justified;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Justified;
break;
case CFX_CSSTextAlign::JustifyAll:
- iAlign = CFX_RTFLineAlignment::Distributed;
+ iAlign = CFGAS_RTFBreak::LineAlignment::Distributed;
break;
default:
break;
