diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-07 17:08:39 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-07 17:08:39 -0500 |
| commit | 594912241cd7d409b5f58a48ccffdc1904d844b2 (patch) | |
| tree | adcdb712f0cfa4cb07d1a490b2d45f15362b4329 /core/include/fxge/fx_font.h | |
| parent | c582c0ddfea8ba01c8449ed7841cdb33c12e0a98 (diff) | |
| download | pdfium-594912241cd7d409b5f58a48ccffdc1904d844b2.tar.xz | |
Revert "Fix chromium-style errors."
This reverts commit c582c0ddfea8ba01c8449ed7841cdb33c12e0a98.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1769263002 .
Diffstat (limited to 'core/include/fxge/fx_font.h')
| -rw-r--r-- | core/include/fxge/fx_font.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 2902145594..67ca1a7f4e 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); + int pitch_family) { + return NULL; + } #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); + virtual int GetFaceIndex(void* hFont) { return 0; } virtual void DeleteFont(void* hFont) = 0; - virtual void* RetainFont(void* hFont); + virtual void* RetainFont(void* hFont) { return NULL; } protected: virtual ~IFX_SystemFontInfo() {} @@ -446,7 +446,6 @@ class CFX_CountedFaceCache { class CFX_FontCache { public: - CFX_FontCache(); ~CFX_FontCache(); CFX_FaceCache* GetCachedFace(CFX_Font* pFont); void ReleaseCachedFace(CFX_Font* pFont); @@ -457,7 +456,6 @@ class CFX_FontCache { CFX_FTCacheMap m_FTFaceMap; CFX_FTCacheMap m_ExtFaceMap; }; - class CFX_AutoFontCache { public: CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont) |