diff options
| author | thestig <thestig@chromium.org> | 2016-06-01 20:18:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-01 20:18:41 -0700 |
| commit | a31d4a90f3446df76d8d3ffa0b441db0ad4623af (patch) | |
| tree | b66f6dafdb562a4aa5ec7364028c00e888836f20 /xfa | |
| parent | dbdcb81a82cd9e46023a3ee500df75717c1a47b4 (diff) | |
| download | pdfium-a31d4a90f3446df76d8d3ffa0b441db0ad4623af.tar.xz | |
Change CFX_Font::GetPsName() to return a CFX_ByteString.
So everyone can avoid doing Byte to WideString conversions.
Also remove CFX_GEFont::GetPsName() and deduplicate a couple of
GetPsName() calls.
Review-Url: https://codereview.chromium.org/2019173002
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fgas/font/fgas_font.h | 1 | ||||
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 4 | ||||
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.h | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h index 406c6f96a8..980538d612 100644 --- a/xfa/fgas/font/fgas_font.h +++ b/xfa/fgas/font/fgas_font.h @@ -71,7 +71,6 @@ class IFX_Font { virtual IFX_Font* Retain() = 0; virtual IFX_Font* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0) = 0; virtual void GetFamilyName(CFX_WideString& wsFamily) const = 0; - virtual void GetPsName(CFX_WideString& wsName) const = 0; virtual uint32_t GetFontStyles() const = 0; virtual uint8_t GetCharSet() const = 0; virtual FX_BOOL GetCharWidth(FX_WCHAR wUnicode, diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 6453a591b5..803bede6e5 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -336,9 +336,7 @@ void CFX_GEFont::GetFamilyName(CFX_WideString& wsFamily) const { m_pFont->GetSubstFont()->m_Family.AsStringC()); } } -void CFX_GEFont::GetPsName(CFX_WideString& wsName) const { - wsName = m_pFont->GetPsName(); -} + uint32_t CFX_GEFont::GetFontStyles() const { ASSERT(m_pFont != NULL); #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h index aa072280d5..8667bf9b0a 100644 --- a/xfa/fgas/font/fgas_gefont.h +++ b/xfa/fgas/font/fgas_gefont.h @@ -19,8 +19,10 @@ class CXFA_PDFFontMgr; class CFX_GEFont : public IFX_Font { public: CFX_GEFont(const CFX_GEFont& src, uint32_t dwFontStyles); - CFX_GEFont(IFX_FontMgr* pFontMgr); + explicit CFX_GEFont(IFX_FontMgr* pFontMgr); ~CFX_GEFont(); + + // IFX_Font: virtual void Release(); virtual IFX_Font* Retain(); FX_BOOL LoadFont(const FX_WCHAR* pszFontFamily, @@ -32,7 +34,6 @@ class CFX_GEFont : public IFX_Font { FX_BOOL LoadFont(CFX_Font* pExtFont, FX_BOOL bTakeOver = FALSE); virtual IFX_Font* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0); virtual void GetFamilyName(CFX_WideString& wsFamily) const; - virtual void GetPsName(CFX_WideString& wsName) const; virtual uint32_t GetFontStyles() const; virtual uint8_t GetCharSet() const; virtual FX_BOOL GetCharWidth(FX_WCHAR wUnicode, |