summaryrefslogtreecommitdiff
path: root/core/include/fxge/fx_font.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-03-08 15:06:12 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-03-08 15:06:12 -0500
commit68b4a4abb713c97badbba54884a477564d41a139 (patch)
tree5d658965dd2833c802c7668d48a839a1de3dba49 /core/include/fxge/fx_font.h
parent508f92f228e27cb0c549add66c608695c8345170 (diff)
downloadpdfium-68b4a4abb713c97badbba54884a477564d41a139.tar.xz
Reland "Fix chromium-style errors."
This reverts commit 594912241cd7d409b5f58a48ccffdc1904d844b2. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1769273002 .
Diffstat (limited to 'core/include/fxge/fx_font.h')
-rw-r--r--core/include/fxge/fx_font.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 67ca1a7f4e..2902145594 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -365,14 +365,14 @@ class IFX_SystemFontInfo {
int pitch_family,
const FX_CHAR* face,
int& iExact) = 0;
+
#ifdef PDF_ENABLE_XFA
virtual void* MapFontByUnicode(FX_DWORD dwUnicode,
int weight,
FX_BOOL bItalic,
- int pitch_family) {
- return NULL;
- }
+ int pitch_family);
#endif // PDF_ENABLE_XFA
+
virtual void* GetFont(const FX_CHAR* face) = 0;
virtual FX_DWORD GetFontData(void* hFont,
FX_DWORD table,
@@ -380,9 +380,9 @@ class IFX_SystemFontInfo {
FX_DWORD size) = 0;
virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) = 0;
virtual FX_BOOL GetFontCharset(void* hFont, int& charset) = 0;
- virtual int GetFaceIndex(void* hFont) { return 0; }
+ virtual int GetFaceIndex(void* hFont);
virtual void DeleteFont(void* hFont) = 0;
- virtual void* RetainFont(void* hFont) { return NULL; }
+ virtual void* RetainFont(void* hFont);
protected:
virtual ~IFX_SystemFontInfo() {}
@@ -446,6 +446,7 @@ class CFX_CountedFaceCache {
class CFX_FontCache {
public:
+ CFX_FontCache();
~CFX_FontCache();
CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
void ReleaseCachedFace(CFX_Font* pFont);
@@ -456,6 +457,7 @@ class CFX_FontCache {
CFX_FTCacheMap m_FTFaceMap;
CFX_FTCacheMap m_ExtFaceMap;
};
+
class CFX_AutoFontCache {
public:
CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont)