diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-25 12:03:18 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-25 19:16:31 +0000 |
| commit | 797ca5cad52edde7c65da45a15216f20b1bfd8fd (patch) | |
| tree | 811a96d5f505e7cff89395cea7dff89604fc9133 /xfa/fde/css | |
| parent | 3a4c408554f2f2ffb5a143f6dadcdd528fcf106e (diff) | |
| download | pdfium-797ca5cad52edde7c65da45a15216f20b1bfd8fd.tar.xz | |
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 <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fde/css')
| -rw-r--r-- | xfa/fde/css/cfde_cssstyleselector.cpp | 2 | ||||
| -rw-r--r-- | xfa/fde/css/cfde_cssstyleselector.h | 2 |
2 files changed, 2 insertions, 2 deletions
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<const CFDE_CSSDeclaration*> 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<CFDE_CSSValueList>& pList); FDE_CSSFontVariant ToFontVariant(FDE_CSSPropertyValue eValue); - CFGAS_FontMgr* const m_pFontMgr; + CFX_UnownedPtr<CFGAS_FontMgr> const m_pFontMgr; float m_fDefFontSize; std::unique_ptr<CFDE_CSSStyleSheet> m_UAStyles; CFDE_CSSRuleCollection m_UARules; |