Remove references to a "FDE" font / font mgr. These classes are all prefixed by CFGAS_ anyways, so make the rest of the naming consistent. Straight rename, no functional changes. Change-Id: I49b69be4f6140521cac9f1daecb1833c1c0e8e2c Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/73193 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 65cf52a..a5a7355 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -54,7 +54,7 @@ } const RetainPtr<CFGAS_GEFont>& CFWL_WidgetTP::GetFont() const { - return m_pFDEFont; + return m_pFGASFont; } void CFWL_WidgetTP::InitializeArrowColorData() { @@ -84,9 +84,9 @@ if (m_pTextOut) return; - m_pFDEFont = CFWL_FontManager::GetInstance()->FindFont(L"Helvetica", 0, 0); + m_pFGASFont = CFWL_FontManager::GetInstance()->FindFont(L"Helvetica", 0, 0); m_pTextOut = std::make_unique<CFDE_TextOut>(); - m_pTextOut->SetFont(m_pFDEFont); + m_pTextOut->SetFont(m_pFGASFont); m_pTextOut->SetFontSize(FWLTHEME_CAPACITY_FontSize); m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor); }
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index c4fa61a..798e6aa 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -73,7 +73,7 @@ const CFX_Matrix& matrix); std::unique_ptr<CFDE_TextOut> m_pTextOut; - RetainPtr<CFGAS_GEFont> m_pFDEFont; + RetainPtr<CFGAS_GEFont> m_pFGASFont; std::unique_ptr<CColorData> m_pColorData; };
diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp index a9d17b3..5377f19 100644 --- a/xfa/fxfa/cxfa_ffapp.cpp +++ b/xfa/fxfa/cxfa_ffapp.cpp
@@ -38,15 +38,15 @@ CXFA_FFApp::~CXFA_FFApp() = default; -CFGAS_FontMgr* CXFA_FFApp::GetFDEFontMgr() { - if (!m_pFDEFontMgr) { - m_pFDEFontMgr = std::make_unique<CFGAS_FontMgr>(); +CFGAS_FontMgr* CXFA_FFApp::GetFGASFontMgr() { + if (!m_pFGASFontMgr) { + m_pFGASFontMgr = std::make_unique<CFGAS_FontMgr>(); if (!g_skipFontLoadForTesting) { - if (!m_pFDEFontMgr->EnumFonts()) - m_pFDEFontMgr = nullptr; + if (!m_pFGASFontMgr->EnumFonts()) + m_pFGASFontMgr = nullptr; } } - return m_pFDEFontMgr.get(); + return m_pFGASFontMgr.get(); } bool CXFA_FFApp::LoadFWLTheme(CXFA_FFDoc* doc) {
diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h index a029e50..4466982 100644 --- a/xfa/fxfa/cxfa_ffapp.h +++ b/xfa/fxfa/cxfa_ffapp.h
@@ -34,7 +34,7 @@ bool LoadFWLTheme(CXFA_FFDoc* doc); CFWL_WidgetMgr* GetFWLWidgetMgr() const { return m_pFWLApp->GetWidgetMgr(); } - CFGAS_FontMgr* GetFDEFontMgr(); + CFGAS_FontMgr* GetFGASFontMgr(); IXFA_AppProvider* GetAppProvider() const { return m_pProvider.Get(); } const CFWL_App* GetFWLApp() const { return m_pFWLApp.get(); } @@ -53,7 +53,7 @@ // // TODO(dsinclair): The GEFont should have the FontMgr as the pointer instead // of the DEFFontMgr so this goes away. Bug 561. - std::unique_ptr<CFGAS_FontMgr> m_pFDEFontMgr; + std::unique_ptr<CFGAS_FontMgr> m_pFGASFontMgr; std::unique_ptr<CXFA_FontMgr> m_pXFAFontMgr; std::unique_ptr<CXFA_FWLAdapterWidgetMgr> m_pAdapterWidgetMgr;
diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp index 82a64cb..7804b95 100644 --- a/xfa/fxfa/cxfa_ffdoc.cpp +++ b/xfa/fxfa/cxfa_ffdoc.cpp
@@ -231,7 +231,7 @@ if (!BuildDoc(pXML)) return false; - CFGAS_FontMgr* mgr = GetApp()->GetFDEFontMgr(); + CFGAS_FontMgr* mgr = GetApp()->GetFGASFontMgr(); if (!mgr) return false;
diff --git a/xfa/fxfa/cxfa_fontmgr.cpp b/xfa/fxfa/cxfa_fontmgr.cpp index 54f0aef..0e7485e 100644 --- a/xfa/fxfa/cxfa_fontmgr.cpp +++ b/xfa/fxfa/cxfa_fontmgr.cpp
@@ -41,7 +41,7 @@ return pFont; } if (!pFont) { - pFont = CFGAS_DefaultFontManager::GetFont(hDoc->GetApp()->GetFDEFontMgr(), + pFont = CFGAS_DefaultFontManager::GetFont(hDoc->GetApp()->GetFGASFontMgr(), wsFontFamily, dwFontStyles); } if (!pFont && pMgr) { @@ -51,11 +51,11 @@ } if (!pFont) { pFont = CFGAS_DefaultFontManager::GetDefaultFont( - hDoc->GetApp()->GetFDEFontMgr(), dwFontStyles); + hDoc->GetApp()->GetFGASFontMgr(), dwFontStyles); } if (!pFont) { pFont = CFGAS_GEFont::LoadStockFont( - hDoc->GetPDFDoc(), hDoc->GetApp()->GetFDEFontMgr(), + hDoc->GetPDFDoc(), hDoc->GetApp()->GetFGASFontMgr(), ByteString::Format("%ls", WideString(wsFontFamily).c_str())); } if (pFont)
diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index 5c74796..14d342b 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp
@@ -59,7 +59,7 @@ } if (!m_pCalendarFont) { - CFGAS_FontMgr* font_mgr = m_pApp->GetFDEFontMgr(); + CFGAS_FontMgr* font_mgr = m_pApp->GetFGASFontMgr(); if (font_mgr) { m_pCalendarFont = font_mgr->GetFontByCodePage( FX_CODEPAGE_MSWin_WesternEuropean, 0, nullptr); @@ -122,7 +122,7 @@ CFX_RenderDevice* pRenderDevice = pGraphics->GetRenderDevice(); m_pTextOut->SetStyles(pParams.m_dwTTOStyles); m_pTextOut->SetAlignment(pParams.m_iTTOAlign); - m_pTextOut->SetFont(pNode->GetFDEFont(pWidget->GetDoc())); + m_pTextOut->SetFont(pNode->GetFGASFont(pWidget->GetDoc())); m_pTextOut->SetFontSize(pNode->GetFontSize()); m_pTextOut->SetTextColor(pNode->GetTextColor()); CFX_Matrix mtPart = pParams.m_matrix; @@ -178,7 +178,7 @@ RetainPtr<CFGAS_GEFont> CXFA_FWLTheme::GetFont( const CFWL_ThemePart& pThemePart) const { if (CXFA_FFWidget* pWidget = GetOutmostFFWidget(pThemePart.m_pWidget)) - return pWidget->GetNode()->GetFDEFont(pWidget->GetDoc()); + return pWidget->GetNode()->GetFGASFont(pWidget->GetDoc()); return GetTheme(pThemePart.m_pWidget)->GetFont(); } @@ -232,7 +232,7 @@ } CXFA_Node* pNode = pWidget->GetNode(); - m_pTextOut->SetFont(pNode->GetFDEFont(pWidget->GetDoc())); + m_pTextOut->SetFont(pNode->GetFGASFont(pWidget->GetDoc())); m_pTextOut->SetFontSize(pNode->GetFontSize()); m_pTextOut->SetTextColor(pNode->GetTextColor()); m_pTextOut->SetAlignment(pParams.m_iTTOAlign);
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 7e25f80..6ea77d7 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -3310,7 +3310,7 @@ if (!layoutData->m_pTextOut) { layoutData->m_pTextOut = std::make_unique<CFDE_TextOut>(); CFDE_TextOut* pTextOut = layoutData->m_pTextOut.get(); - pTextOut->SetFont(GetFDEFont(doc)); + pTextOut->SetFont(GetFGASFont(doc)); pTextOut->SetFontSize(fFontSize); pTextOut->SetLineBreakTolerance(fFontSize * 0.2f); pTextOut->SetLineSpace(GetLineHeight()); @@ -3942,7 +3942,7 @@ pData->m_pDIBitmap = newImage; } -RetainPtr<CFGAS_GEFont> CXFA_Node::GetFDEFont(CXFA_FFDoc* doc) { +RetainPtr<CFGAS_GEFont> CXFA_Node::GetFGASFont(CXFA_FFDoc* doc) { WideString wsFontName = L"Courier"; uint32_t dwFontStyle = 0; CXFA_Font* font = GetFontIfExists();
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index d18d6db..fdccd76 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h
@@ -314,7 +314,7 @@ void SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage); void SetImageEditImage(const RetainPtr<CFX_DIBitmap>& newImage); - RetainPtr<CFGAS_GEFont> GetFDEFont(CXFA_FFDoc* doc); + RetainPtr<CFGAS_GEFont> GetFGASFont(CXFA_FFDoc* doc); bool IsListBox(); bool IsRadioButton();