summaryrefslogtreecommitdiff
path: root/xfa/fgas/font/fgas_gefont.h
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-01 20:18:41 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-01 20:18:41 -0700
commita31d4a90f3446df76d8d3ffa0b441db0ad4623af (patch)
treeb66f6dafdb562a4aa5ec7364028c00e888836f20 /xfa/fgas/font/fgas_gefont.h
parentdbdcb81a82cd9e46023a3ee500df75717c1a47b4 (diff)
downloadpdfium-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/fgas/font/fgas_gefont.h')
-rw-r--r--xfa/fgas/font/fgas_gefont.h5
1 files changed, 3 insertions, 2 deletions
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,