From 275e260a6cd4a8e506ba974feb85ebcd926c1739 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 18 Sep 2017 14:23:18 -0400 Subject: Convert string class names Automated using git grep & sed. Replace StringC classes with StringView classes. Remove the CFX_ prefix and put string classes in fxcrt namespace. Change AsStringC() to AsStringView(). Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*, Foo). Couple of tests needed to have their names regularlized. BUG=pdfium:894 Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d Reviewed-on: https://pdfium-review.googlesource.com/14151 Reviewed-by: Tom Sepez Commit-Queue: Ryan Harrison --- xfa/fxfa/cxfa_pdffontmgr.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/cxfa_pdffontmgr.h') diff --git a/xfa/fxfa/cxfa_pdffontmgr.h b/xfa/fxfa/cxfa_pdffontmgr.h index df8ab28e08..4c8941f8f0 100644 --- a/xfa/fxfa/cxfa_pdffontmgr.h +++ b/xfa/fxfa/cxfa_pdffontmgr.h @@ -25,7 +25,7 @@ class CXFA_PDFFontMgr : public CFX_Observable { explicit CXFA_PDFFontMgr(CXFA_FFDoc* pDoc); ~CXFA_PDFFontMgr(); - CFX_RetainPtr GetFont(const CFX_WideStringC& wsFontFamily, + CFX_RetainPtr GetFont(const WideStringView& wsFontFamily, uint32_t dwFontStyles, CPDF_Font** pPDFFont, bool bStrictMatch); @@ -36,23 +36,23 @@ class CXFA_PDFFontMgr : public CFX_Observable { void SetFont(const CFX_RetainPtr& pFont, CPDF_Font* pPDFFont); private: - CFX_RetainPtr FindFont(const CFX_ByteString& strFamilyName, + CFX_RetainPtr FindFont(const ByteString& strFamilyName, bool bBold, bool bItalic, CPDF_Font** pPDFFont, bool bStrictMatch); - CFX_ByteString PsNameToFontName(const CFX_ByteString& strPsName, - bool bBold, - bool bItalic); - bool PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, + ByteString PsNameToFontName(const ByteString& strPsName, + bool bBold, + bool bItalic); + bool PsNameMatchDRFontName(const ByteStringView& bsPsName, bool bBold, bool bItalic, - const CFX_ByteString& bsDRFontName, + const ByteString& bsDRFontName, bool bStrictMatch); CFX_UnownedPtr const m_pDoc; std::map, CPDF_Font*> m_FDE2PDFFont; - std::map> m_FontMap; + std::map> m_FontMap; }; #endif // XFA_FXFA_CXFA_PDFFONTMGR_H_ -- cgit v1.2.3