From 797ca5cad52edde7c65da45a15216f20b1bfd8fd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 25 May 2017 12:03:18 -0700 Subject: Mass conversion of all const-lifetime class members Sed + minimal conversions to compile, including moving some constructors into the .cpp file. Any that caused ASAN issues during the tests were omitted rather than trying to resolve the underlying issue. Change-Id: I00a421f33b253eb4071ffd9af3f2922c7443b335 Reviewed-on: https://pdfium-review.googlesource.com/5891 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- xfa/fde/css/cfde_cssstyleselector.cpp | 2 +- xfa/fde/css/cfde_cssstyleselector.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/cfde_cssstyleselector.cpp b/xfa/fde/css/cfde_cssstyleselector.cpp index 024c8a86e2..461192e976 100644 --- a/xfa/fde/css/cfde_cssstyleselector.cpp +++ b/xfa/fde/css/cfde_cssstyleselector.cpp @@ -48,7 +48,7 @@ void CFDE_CSSStyleSelector::SetUAStyleSheet( void CFDE_CSSStyleSelector::UpdateStyleIndex() { m_UARules.Clear(); - m_UARules.AddRulesFrom(m_UAStyles.get(), m_pFontMgr); + m_UARules.AddRulesFrom(m_UAStyles.get(), m_pFontMgr.Get()); } std::vector diff --git a/xfa/fde/css/cfde_cssstyleselector.h b/xfa/fde/css/cfde_cssstyleselector.h index 0783e72541..6f40c968c7 100644 --- a/xfa/fde/css/cfde_cssstyleselector.h +++ b/xfa/fde/css/cfde_cssstyleselector.h @@ -78,7 +78,7 @@ class CFDE_CSSStyleSelector { uint32_t ToTextDecoration(const CFX_RetainPtr& pList); FDE_CSSFontVariant ToFontVariant(FDE_CSSPropertyValue eValue); - CFGAS_FontMgr* const m_pFontMgr; + CFX_UnownedPtr const m_pFontMgr; float m_fDefFontSize; std::unique_ptr m_UAStyles; CFDE_CSSRuleCollection m_UARules; -- cgit v1.2.3