From 16e587e9c34d713bb15c853e11891f0cf4d5f140 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 3 Jun 2016 16:02:17 -0700 Subject: Rename IFX_FontMgr to IFGAS_FontMgr Avoid confusion with CFX_FontMgr, which does not inherit from IFX_FontMgr, and lives in a different layer of code. Do the same CFX_ -> CFGAS_ transformation for the concrete classes that implement IFGAS_FontMgr. Review-Url: https://codereview.chromium.org/2039463003 --- xfa/fde/css/fde_cssstyleselector.cpp | 6 +++--- xfa/fde/css/fde_cssstyleselector.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'xfa/fde') diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp index bce8f704b8..c684d0bece 100644 --- a/xfa/fde/css/fde_cssstyleselector.cpp +++ b/xfa/fde/css/fde_cssstyleselector.cpp @@ -105,7 +105,7 @@ void CFDE_CSSRuleCollection::Clear() { } void CFDE_CSSRuleCollection::AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets, uint32_t dwMediaList, - IFX_FontMgr* pFontMgr) { + IFGAS_FontMgr* pFontMgr) { int32_t iSheets = sheets.GetSize(); for (int32_t i = 0; i < iSheets; ++i) { IFDE_CSSStyleSheet* pSheet = sheets.GetAt(i); @@ -120,7 +120,7 @@ void CFDE_CSSRuleCollection::AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets, void CFDE_CSSRuleCollection::AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, IFDE_CSSRule* pRule, uint32_t dwMediaList, - IFX_FontMgr* pFontMgr) { + IFGAS_FontMgr* pFontMgr) { switch (pRule->GetType()) { case FDE_CSSRULETYPE_Style: { IFDE_CSSStyleRule* pStyleRule = (IFDE_CSSStyleRule*)pRule; @@ -229,7 +229,7 @@ CFDE_CSSStyleSelector::~CFDE_CSSStyleSelector() { delete m_pAccelerator; } -void CFDE_CSSStyleSelector::SetFontMgr(IFX_FontMgr* pFontMgr) { +void CFDE_CSSStyleSelector::SetFontMgr(IFGAS_FontMgr* pFontMgr) { m_pFontMgr = pFontMgr; } void CFDE_CSSStyleSelector::SetDefFontSize(FX_FLOAT fFontSize) { diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index 7227f9aab9..1b6d10c9f7 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -43,7 +43,7 @@ class CFDE_CSSRuleCollection : public CFX_Target { void AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets, uint32_t dwMediaList, - IFX_FontMgr* pFontMgr); + IFGAS_FontMgr* pFontMgr); void Clear(); int32_t CountSelectors() const { return m_iSelectors; } @@ -74,7 +74,7 @@ class CFDE_CSSRuleCollection : public CFX_Target { void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, IFDE_CSSRule* pRule, uint32_t dwMediaList, - IFX_FontMgr* pFontMgr); + IFGAS_FontMgr* pFontMgr); void AddRuleTo(CFX_MapPtrToPtr& map, uint32_t dwKey, CFDE_CSSSelector* pSel, @@ -95,7 +95,7 @@ class CFDE_CSSStyleSelector : public CFX_Target { CFDE_CSSStyleSelector(); ~CFDE_CSSStyleSelector() override; - void SetFontMgr(IFX_FontMgr* pFontMgr); + void SetFontMgr(IFGAS_FontMgr* pFontMgr); void SetDefFontSize(FX_FLOAT fFontSize); FX_BOOL SetStyleSheet(FDE_CSSSTYLESHEETGROUP eType, @@ -178,7 +178,7 @@ class CFDE_CSSStyleSelector : public CFX_Target { FDE_CSSRUBYPOSITION ToRubyPosition(FDE_CSSPROPERTYVALUE eValue); FDE_CSSRUBYSPAN ToRubySpan(FDE_CSSPROPERTYVALUE eValue); - IFX_FontMgr* m_pFontMgr; + IFGAS_FontMgr* m_pFontMgr; FX_FLOAT m_fDefFontSize; IFX_MemoryAllocator* m_pRuleDataStore; CFDE_CSSStyleSheetArray m_SheetGroups[FDE_CSSSTYLESHEETGROUP_MAX]; -- cgit v1.2.3