From 2b70ec2d6df96bdf6f72cfac7a8cbbcdd1293d8c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 27 Jul 2017 11:58:31 -0400 Subject: The FDE CSS code does not use the CFGAS_FontMgr The CFGAS_FontMgr is being provided to the CSS style selector in order to pas it to the RulesCollection. The RulesCollection does not use the font manager so remove the font manager from the CSS code. Change-Id: I61a4a5060053615935902cb31fbc12d9856acded Reviewed-on: https://pdfium-review.googlesource.com/9270 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fde/css/cfde_cssrulecollection.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xfa/fde/css/cfde_cssrulecollection.cpp') diff --git a/xfa/fde/css/cfde_cssrulecollection.cpp b/xfa/fde/css/cfde_cssrulecollection.cpp index e318651137..b945fd518b 100644 --- a/xfa/fde/css/cfde_cssrulecollection.cpp +++ b/xfa/fde/css/cfde_cssrulecollection.cpp @@ -33,16 +33,14 @@ CFDE_CSSRuleCollection::GetTagRuleData(const CFX_WideString& tagname) const { return it != m_TagRules.end() ? &it->second : nullptr; } -void CFDE_CSSRuleCollection::AddRulesFrom(const CFDE_CSSStyleSheet* sheet, - CFGAS_FontMgr* pFontMgr) { +void CFDE_CSSRuleCollection::AddRulesFrom(const CFDE_CSSStyleSheet* sheet) { int32_t iRules = sheet->CountRules(); for (int32_t j = 0; j < iRules; j++) - AddRulesFrom(sheet, sheet->GetRule(j), pFontMgr); + AddRulesFrom(sheet, sheet->GetRule(j)); } void CFDE_CSSRuleCollection::AddRulesFrom(const CFDE_CSSStyleSheet* pStyleSheet, - CFDE_CSSStyleRule* pStyleRule, - CFGAS_FontMgr* pFontMgr) { + CFDE_CSSStyleRule* pStyleRule) { CFDE_CSSDeclaration* pDeclaration = pStyleRule->GetDeclaration(); int32_t iSelectors = pStyleRule->CountSelectorLists(); for (int32_t i = 0; i < iSelectors; ++i) { -- cgit v1.2.3