| Index: core/src/fxge/android/fx_android_font.h
|
| diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h
|
| index b6bfdf9396ce3ca089600b2eaf2982d497ae591b..645c29816ba8c7d9cfb785872fd2375a09792a8a 100644
|
| --- a/core/src/fxge/android/fx_android_font.h
|
| +++ b/core/src/fxge/android/fx_android_font.h
|
| @@ -1,36 +1,41 @@
|
| // Copyright 2014 PDFium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| +
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| #ifndef _FX_ANDROID_FONT_H_
|
| #define _FX_ANDROID_FONT_H_
|
| #if _FX_OS_ == _FX_ANDROID_
|
| class IFPF_FontMgr;
|
| -class CFX_AndroidFontInfo : public IFX_SystemFontInfo
|
| -{
|
| -public:
|
| - CFX_AndroidFontInfo();
|
| - virtual void Release()
|
| - {
|
| - delete this;
|
| - }
|
| +class CFX_AndroidFontInfo : public IFX_SystemFontInfo {
|
| + public:
|
| + CFX_AndroidFontInfo();
|
| + virtual void Release() { delete this; }
|
| +
|
| + virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper);
|
|
|
| - virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper);
|
| + virtual void* MapFont(int weight,
|
| + FX_BOOL bItalic,
|
| + int charset,
|
| + int pitch_family,
|
| + FX_LPCSTR face,
|
| + FX_BOOL& bExact);
|
|
|
| - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact);
|
| + virtual void* GetFont(FX_LPCSTR face);
|
| + virtual FX_DWORD GetFontData(void* hFont,
|
| + FX_DWORD table,
|
| + FX_LPBYTE buffer,
|
| + FX_DWORD size);
|
| + virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name);
|
| + virtual FX_BOOL GetFontCharset(void* hFont, int& charset);
|
|
|
| - virtual void* GetFont(FX_LPCSTR face);
|
| - virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size);
|
| - virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name);
|
| - virtual FX_BOOL GetFontCharset(void* hFont, int& charset);
|
| + virtual void DeleteFont(void* hFont);
|
| + virtual void* RetainFont(void* hFont);
|
| + FX_BOOL Init(IFPF_FontMgr* pFontMgr);
|
|
|
| - virtual void DeleteFont(void* hFont);
|
| - virtual void* RetainFont(void* hFont);
|
| - FX_BOOL Init(IFPF_FontMgr *pFontMgr);
|
| -protected:
|
| - IFPF_FontMgr *m_pFontMgr;
|
| + protected:
|
| + IFPF_FontMgr* m_pFontMgr;
|
| };
|
| #endif
|
| #endif
|
|
|