diff options
author | Ryan Harrison <rharrison@chromium.org> | 2017-09-18 14:23:18 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-18 18:40:16 +0000 |
commit | 275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch) | |
tree | 2029b9158ec044764ceff122fe5fb5d0a3f123d1 /fpdfsdk/pwl/cpwl_font_map.h | |
parent | 450fbeaaabf1ab340c1018de2e58f1950657517e (diff) | |
download | pdfium-275e260a6cd4a8e506ba974feb85ebcd926c1739.tar.xz |
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 <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_font_map.h')
-rw-r--r-- | fpdfsdk/pwl/cpwl_font_map.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/fpdfsdk/pwl/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h index 9872779c95..5336949399 100644 --- a/fpdfsdk/pwl/cpwl_font_map.h +++ b/fpdfsdk/pwl/cpwl_font_map.h @@ -21,12 +21,12 @@ class CFX_SystemHandler; struct CPWL_FontMap_Data { CPDF_Font* pFont; int32_t nCharset; - CFX_ByteString sFontName; + ByteString sFontName; }; struct CPWL_FontMap_Native { int32_t nCharset; - CFX_ByteString sFontName; + ByteString sFontName; }; class CPWL_FontMap : public IPVT_FontMap { @@ -36,7 +36,7 @@ class CPWL_FontMap : public IPVT_FontMap { // IPVT_FontMap CPDF_Font* GetPDFFont(int32_t nFontIndex) override; - CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) override; + ByteString GetPDFFontAlias(int32_t nFontIndex) override; int32_t GetWordFontIndex(uint16_t word, int32_t nCharset, int32_t nFontIndex) override; @@ -45,47 +45,46 @@ class CPWL_FontMap : public IPVT_FontMap { const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const; static int32_t GetNativeCharset(); - CFX_ByteString GetNativeFontName(int32_t nCharset); + ByteString GetNativeFontName(int32_t nCharset); - static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset); + static ByteString GetDefaultFontByCharset(int32_t nCharset); static const FPDF_CharsetFontMap defaultTTFMap[]; protected: virtual void Initialize(); virtual CPDF_Document* GetDocument(); - virtual CPDF_Font* FindFontSameCharset(CFX_ByteString* sFontAlias, + virtual CPDF_Font* FindFontSameCharset(ByteString* sFontAlias, int32_t nCharset); - virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); + virtual void AddedFont(CPDF_Font* pFont, const ByteString& sFontAlias); bool KnowWord(int32_t nFontIndex, uint16_t word); void Empty(); - int32_t GetFontIndex(const CFX_ByteString& sFontName, + int32_t GetFontIndex(const ByteString& sFontName, int32_t nCharset, bool bFind); int32_t AddFontData(CPDF_Font* pFont, - const CFX_ByteString& sFontAlias, + const ByteString& sFontAlias, int32_t nCharset = FX_CHARSET_Default); - CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName, - int32_t nCharset); - CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName); + ByteString EncodeFontAlias(const ByteString& sFontName, int32_t nCharset); + ByteString EncodeFontAlias(const ByteString& sFontName); std::vector<std::unique_ptr<CPWL_FontMap_Data>> m_Data; std::vector<std::unique_ptr<CPWL_FontMap_Native>> m_NativeFont; private: - int32_t FindFont(const CFX_ByteString& sFontName, + int32_t FindFont(const ByteString& sFontName, int32_t nCharset = FX_CHARSET_Default); - CFX_ByteString GetNativeFont(int32_t nCharset); + ByteString GetNativeFont(int32_t nCharset); CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, - CFX_ByteString& sFontName, + ByteString& sFontName, uint8_t nCharset); - bool IsStandardFont(const CFX_ByteString& sFontName); - CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName); + bool IsStandardFont(const ByteString& sFontName); + CPDF_Font* AddStandardFont(CPDF_Document* pDoc, ByteString& sFontName); CPDF_Font* AddSystemFont(CPDF_Document* pDoc, - CFX_ByteString& sFontName, + ByteString& sFontName, uint8_t nCharset); std::unique_ptr<CPDF_Document> m_pPDFDoc; |