diff options
Diffstat (limited to 'core/src/fxge/android')
-rw-r--r-- | core/src/fxge/android/fpf_skiafont.cpp | 217 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiafont.h | 60 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.cpp | 524 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.h | 127 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiamodule.cpp | 38 | ||||
-rw-r--r-- | core/src/fxge/android/fpf_skiamodule.h | 30 | ||||
-rw-r--r-- | core/src/fxge/android/fx_android_font.cpp | 89 | ||||
-rw-r--r-- | core/src/fxge/android/fx_android_font.h | 49 | ||||
-rw-r--r-- | core/src/fxge/android/fx_android_imp.cpp | 34 |
9 files changed, 0 insertions, 1168 deletions
diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/src/fxge/android/fpf_skiafont.cpp deleted file mode 100644 index ba0c40a4f4..0000000000 --- a/core/src/fxge/android/fpf_skiafont.cpp +++ /dev/null @@ -1,217 +0,0 @@ -// 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 - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include <algorithm> - -#include "core/include/fxge/fx_freetype.h" -#include "core/src/fxge/android/fpf_skiafont.h" -#include "core/src/fxge/android/fpf_skiafontmgr.h" - -#define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) - -CFPF_SkiaFont::CFPF_SkiaFont() - : m_pFontMgr(NULL), - m_pFontDes(NULL), - m_Face(NULL), - m_dwStyle(0), - m_uCharset(0), - m_dwRefCount(0) {} -CFPF_SkiaFont::~CFPF_SkiaFont() { - if (m_Face) { - FXFT_Done_Face(m_Face); - } -} -void CFPF_SkiaFont::Release() { - if (--m_dwRefCount == 0) { - delete this; - } -} -IFPF_Font* CFPF_SkiaFont::Retain() { - m_dwRefCount++; - return (IFPF_Font*)this; -} -FPF_HFONT CFPF_SkiaFont::GetHandle() { - return NULL; -} -CFX_ByteString CFPF_SkiaFont::GetFamilyName() { - if (!m_Face) { - return CFX_ByteString(); - } - return CFX_ByteString(FXFT_Get_Face_Family_Name(m_Face)); -} -CFX_WideString CFPF_SkiaFont::GetPsName() { - if (!m_Face) { - return CFX_WideString(); - } - return CFX_WideString::FromLocal(FXFT_Get_Postscript_Name(m_Face)); -} -int32_t CFPF_SkiaFont::GetGlyphIndex(FX_WCHAR wUnicode) { - if (!m_Face) { - return wUnicode; - } - if (FXFT_Select_Charmap(m_Face, FXFT_ENCODING_UNICODE)) { - return 0; - } - return FXFT_Get_Char_Index(m_Face, wUnicode); -} -int32_t CFPF_SkiaFont::GetGlyphWidth(int32_t iGlyphIndex) { - if (!m_Face) { - return 0; - } - if (FXFT_Load_Glyph( - m_Face, iGlyphIndex, - FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) { - return 0; - } - return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Glyph_HoriAdvance(m_Face)); -} -int32_t CFPF_SkiaFont::GetAscent() const { - if (!m_Face) { - return 0; - } - return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_Ascender(m_Face)); -} -int32_t CFPF_SkiaFont::GetDescent() const { - if (!m_Face) { - return 0; - } - return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_Descender(m_Face)); -} -FX_BOOL CFPF_SkiaFont::GetGlyphBBox(int32_t iGlyphIndex, FX_RECT& rtBBox) { - if (!m_Face) { - return FALSE; - } - if (FXFT_Is_Face_Tricky(m_Face)) { - if (FXFT_Set_Char_Size(m_Face, 0, 1000 * 64, 72, 72)) { - return FALSE; - } - if (FXFT_Load_Glyph(m_Face, iGlyphIndex, - FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) { - FXFT_Set_Pixel_Sizes(m_Face, 0, 64); - return FALSE; - } - FXFT_Glyph glyph; - if (FXFT_Get_Glyph(m_Face->glyph, &glyph)) { - FXFT_Set_Pixel_Sizes(m_Face, 0, 64); - return FALSE; - } - FXFT_BBox cbox; - FXFT_Glyph_Get_CBox(glyph, FXFT_GLYPH_BBOX_PIXELS, &cbox); - int32_t x_ppem = m_Face->size->metrics.x_ppem; - int32_t y_ppem = m_Face->size->metrics.y_ppem; - rtBBox.left = FPF_EM_ADJUST(x_ppem, cbox.xMin); - rtBBox.right = FPF_EM_ADJUST(x_ppem, cbox.xMax); - rtBBox.top = FPF_EM_ADJUST(y_ppem, cbox.yMax); - rtBBox.bottom = FPF_EM_ADJUST(y_ppem, cbox.yMin); - rtBBox.top = std::min(rtBBox.top, GetAscent()); - rtBBox.bottom = std::max(rtBBox.bottom, GetDescent()); - FXFT_Done_Glyph(glyph); - return FXFT_Set_Pixel_Sizes(m_Face, 0, 64) == 0; - } - if (FXFT_Load_Glyph( - m_Face, iGlyphIndex, - FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) { - return FALSE; - } - rtBBox.left = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Glyph_HoriBearingX(m_Face)); - rtBBox.bottom = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Glyph_HoriBearingY(m_Face)); - rtBBox.right = FPF_EM_ADJUST( - FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Glyph_HoriBearingX(m_Face) + FXFT_Get_Glyph_Width(m_Face)); - rtBBox.top = FPF_EM_ADJUST( - FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Glyph_HoriBearingY(m_Face) - FXFT_Get_Glyph_Height(m_Face)); - return TRUE; -} -FX_BOOL CFPF_SkiaFont::GetBBox(FX_RECT& rtBBox) { - if (!m_Face) { - return FALSE; - } - rtBBox.left = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_xMin(m_Face)); - rtBBox.top = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_yMin(m_Face)); - rtBBox.right = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_xMax(m_Face)); - rtBBox.bottom = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_yMax(m_Face)); - return TRUE; -} -int32_t CFPF_SkiaFont::GetHeight() const { - if (!m_Face) { - return 0; - } - return FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), - FXFT_Get_Face_Height(m_Face)); -} -int32_t CFPF_SkiaFont::GetItalicAngle() const { - if (!m_Face) { - return 0; - } - TT_Postscript* ttInfo = - (TT_Postscript*)FT_Get_Sfnt_Table(m_Face, ft_sfnt_post); - if (ttInfo) { - return ttInfo->italicAngle; - } - return 0; -} -FX_DWORD CFPF_SkiaFont::GetFontData(FX_DWORD dwTable, - uint8_t* pBuffer, - FX_DWORD dwSize) { - if (!m_Face) { - return 0; - } - FT_ULong ulSize = pdfium::base::checked_cast<FT_ULong>(dwSize); - if (FXFT_Load_Sfnt_Table(m_Face, dwTable, 0, pBuffer, &ulSize)) { - return 0; - } - return pdfium::base::checked_cast<FX_DWORD>(ulSize); -} -FX_BOOL CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr* pFontMgr, - CFPF_SkiaFontDescriptor* pFontDes, - const CFX_ByteStringC& bsFamily, - FX_DWORD dwStyle, - uint8_t uCharset) { - if (!pFontMgr || !pFontDes) { - return FALSE; - } - switch (pFontDes->GetType()) { - case FPF_SKIAFONTTYPE_Path: { - CFPF_SkiaPathFont* pFont = (CFPF_SkiaPathFont*)pFontDes; - m_Face = pFontMgr->GetFontFace(pFont->m_pPath, pFont->m_iFaceIndex); - } break; - case FPF_SKIAFONTTYPE_File: { - CFPF_SkiaFileFont* pFont = (CFPF_SkiaFileFont*)pFontDes; - m_Face = pFontMgr->GetFontFace(pFont->m_pFile, pFont->m_iFaceIndex); - } break; - case FPF_SKIAFONTTYPE_Buffer: { - CFPF_SkiaBufferFont* pFont = (CFPF_SkiaBufferFont*)pFontDes; - m_Face = pFontMgr->GetFontFace((const uint8_t*)pFont->m_pBuffer, - pFont->m_szBuffer, pFont->m_iFaceIndex); - } break; - default: - return FALSE; - } - if (!m_Face) { - return FALSE; - } - m_dwStyle = dwStyle; - m_uCharset = uCharset; - m_pFontMgr = pFontMgr; - m_pFontDes = pFontDes; - m_dwRefCount = 1; - return TRUE; -} -#endif diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h deleted file mode 100644 index c12ec43690..0000000000 --- a/core/src/fxge/android/fpf_skiafont.h +++ /dev/null @@ -1,60 +0,0 @@ -// 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 CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ -#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_font.h" - -class CFPF_SkiaFontDescriptor; -class CFPF_SkiaFontMgr; -class CFPF_SkiaFont : public IFPF_Font { - public: - CFPF_SkiaFont(); - ~CFPF_SkiaFont() override; - - // IFPF_Font - void Release() override; - IFPF_Font* Retain() override; - FPF_HFONT GetHandle() override; - CFX_ByteString GetFamilyName() override; - CFX_WideString GetPsName() override; - FX_DWORD GetFontStyle() const override { return m_dwStyle; } - uint8_t GetCharset() const override { return m_uCharset; } - int32_t GetGlyphIndex(FX_WCHAR wUnicode) override; - int32_t GetGlyphWidth(int32_t iGlyphIndex) override; - int32_t GetAscent() const override; - int32_t GetDescent() const override; - FX_BOOL GetGlyphBBox(int32_t iGlyphIndex, FX_RECT& rtBBox) override; - FX_BOOL GetBBox(FX_RECT& rtBBox) override; - int32_t GetHeight() const override; - int32_t GetItalicAngle() const override; - FX_DWORD GetFontData(FX_DWORD dwTable, - uint8_t* pBuffer, - FX_DWORD dwSize) override; - - FX_BOOL InitFont(CFPF_SkiaFontMgr* pFontMgr, - CFPF_SkiaFontDescriptor* pFontDes, - const CFX_ByteStringC& bsFamily, - FX_DWORD dwStyle, - uint8_t uCharset); - - protected: - CFPF_SkiaFontMgr* m_pFontMgr; - CFPF_SkiaFontDescriptor* m_pFontDes; - FXFT_Face m_Face; - FX_DWORD m_dwStyle; - uint8_t m_uCharset; - FX_DWORD m_dwRefCount; -}; -#endif - -#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp deleted file mode 100644 index 5d075c6d08..0000000000 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ /dev/null @@ -1,524 +0,0 @@ -// 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 - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#define FPF_SKIAMATCHWEIGHT_NAME1 62 -#define FPF_SKIAMATCHWEIGHT_NAME2 60 -#define FPF_SKIAMATCHWEIGHT_1 16 -#define FPF_SKIAMATCHWEIGHT_2 8 - -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxge/fx_freetype.h" -#include "core/src/fxge/android/fpf_skiafont.h" -#include "core/src/fxge/android/fpf_skiafontmgr.h" - -#ifdef __cplusplus -extern "C" { -#endif -static unsigned long FPF_SkiaStream_Read(FXFT_Stream stream, - unsigned long offset, - unsigned char* buffer, - unsigned long count) { - IFX_FileRead* pFileRead = (IFX_FileRead*)stream->descriptor.pointer; - if (!pFileRead) { - return 0; - } - if (count > 0) { - if (pFileRead->ReadBlock(buffer, (FX_FILESIZE)offset, (size_t)count) != - count) { - return 0; - } - } - return count; -} -static void FPF_SkiaStream_Close(FXFT_Stream stream) {} -#ifdef __cplusplus -}; -#endif -struct FPF_SKIAFONTMAP { - FX_DWORD dwFamily; - FX_DWORD dwSubSt; -}; -static const FPF_SKIAFONTMAP g_SkiaFontmap[] = { - {0x58c5083, 0xc8d2e345}, {0x5dfade2, 0xe1633081}, - {0x684317d, 0xe1633081}, {0x14ee2d13, 0xc8d2e345}, - {0x3918fe2d, 0xbbeeec72}, {0x3b98b31c, 0xe1633081}, - {0x3d49f40e, 0xe1633081}, {0x432c41c5, 0xe1633081}, - {0x491b6ad0, 0xe1633081}, {0x5612cab1, 0x59b9f8f1}, - {0x779ce19d, 0xc8d2e345}, {0x7cc9510b, 0x59b9f8f1}, - {0x83746053, 0xbbeeec72}, {0xaaa60c03, 0xbbeeec72}, - {0xbf85ff26, 0xe1633081}, {0xc04fe601, 0xbbeeec72}, - {0xca3812d5, 0x59b9f8f1}, {0xca383e15, 0x59b9f8f1}, - {0xcad5eaf6, 0x59b9f8f1}, {0xcb7a04c8, 0xc8d2e345}, - {0xfb4ce0de, 0xe1633081}, -}; -FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash) { - int32_t iStart = 0; - int32_t iEnd = sizeof(g_SkiaFontmap) / sizeof(FPF_SKIAFONTMAP); - while (iStart <= iEnd) { - int32_t iMid = (iStart + iEnd) / 2; - const FPF_SKIAFONTMAP* pItem = &g_SkiaFontmap[iMid]; - if (dwHash < pItem->dwFamily) { - iEnd = iMid - 1; - } else if (dwHash > pItem->dwFamily) { - iStart = iMid + 1; - } else { - return pItem->dwSubSt; - } - } - return 0; -} -static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = { - {0x58c5083, 0xd5b8d10f}, {0x14ee2d13, 0xd5b8d10f}, - {0x779ce19d, 0xd5b8d10f}, {0xcb7a04c8, 0xd5b8d10f}, - {0xfb4ce0de, 0xd5b8d10f}, -}; -FX_DWORD FPF_SkiaGetSansFont(FX_DWORD dwHash) { - int32_t iStart = 0; - int32_t iEnd = sizeof(g_SkiaSansFontMap) / sizeof(FPF_SKIAFONTMAP); - while (iStart <= iEnd) { - int32_t iMid = (iStart + iEnd) / 2; - const FPF_SKIAFONTMAP* pItem = &g_SkiaSansFontMap[iMid]; - if (dwHash < pItem->dwFamily) { - iEnd = iMid - 1; - } else if (dwHash > pItem->dwFamily) { - iStart = iMid + 1; - } else { - return pItem->dwSubSt; - } - } - return 0; -} -static uint32_t FPF_GetHashCode_StringA(const FX_CHAR* pStr, - int32_t iLength, - FX_BOOL bIgnoreCase = FALSE) { - if (!pStr) { - return 0; - } - if (iLength < 0) { - iLength = FXSYS_strlen(pStr); - } - const FX_CHAR* pStrEnd = pStr + iLength; - uint32_t uHashCode = 0; - if (bIgnoreCase) { - while (pStr < pStrEnd) { - uHashCode = 31 * uHashCode + FXSYS_tolower(*pStr++); - } - } else { - while (pStr < pStrEnd) { - uHashCode = 31 * uHashCode + *pStr++; - } - } - return uHashCode; -} -enum FPF_SKIACHARSET { - FPF_SKIACHARSET_Ansi = 1 << 0, - FPF_SKIACHARSET_Default = 1 << 1, - FPF_SKIACHARSET_Symbol = 1 << 2, - FPF_SKIACHARSET_ShiftJIS = 1 << 3, - FPF_SKIACHARSET_Korean = 1 << 4, - FPF_SKIACHARSET_Johab = 1 << 5, - FPF_SKIACHARSET_GB2312 = 1 << 6, - FPF_SKIACHARSET_BIG5 = 1 << 7, - FPF_SKIACHARSET_Greek = 1 << 8, - FPF_SKIACHARSET_Turkish = 1 << 9, - FPF_SKIACHARSET_Vietnamese = 1 << 10, - FPF_SKIACHARSET_Hebrew = 1 << 11, - FPF_SKIACHARSET_Arabic = 1 << 12, - FPF_SKIACHARSET_Baltic = 1 << 13, - FPF_SKIACHARSET_Cyrillic = 1 << 14, - FPF_SKIACHARSET_Thai = 1 << 15, - FPF_SKIACHARSET_EeasternEuropean = 1 << 16, - FPF_SKIACHARSET_PC = 1 << 17, - FPF_SKIACHARSET_OEM = 1 << 18, -}; -static FX_DWORD FPF_SkiaGetCharset(uint8_t uCharset) { - switch (uCharset) { - case FXFONT_ANSI_CHARSET: - return FPF_SKIACHARSET_Ansi; - case FXFONT_DEFAULT_CHARSET: - return FPF_SKIACHARSET_Default; - case FXFONT_SYMBOL_CHARSET: - return FPF_SKIACHARSET_Symbol; - case FXFONT_SHIFTJIS_CHARSET: - return FPF_SKIACHARSET_ShiftJIS; - case FXFONT_HANGEUL_CHARSET: - return FPF_SKIACHARSET_Korean; - case FXFONT_GB2312_CHARSET: - return FPF_SKIACHARSET_GB2312; - case FXFONT_CHINESEBIG5_CHARSET: - return FPF_SKIACHARSET_BIG5; - case FXFONT_GREEK_CHARSET: - return FPF_SKIACHARSET_Greek; - case FXFONT_TURKISH_CHARSET: - return FPF_SKIACHARSET_Turkish; - case FXFONT_HEBREW_CHARSET: - return FPF_SKIACHARSET_Hebrew; - case FXFONT_ARABIC_CHARSET: - return FPF_SKIACHARSET_Arabic; - case FXFONT_BALTIC_CHARSET: - return FPF_SKIACHARSET_Baltic; - case FXFONT_RUSSIAN_CHARSET: - return FPF_SKIACHARSET_Cyrillic; - case FXFONT_THAI_CHARSET: - return FPF_SKIACHARSET_Thai; - case FXFONT_EASTEUROPE_CHARSET: - return FPF_SKIACHARSET_EeasternEuropean; - } - return FPF_SKIACHARSET_Default; -} -static FX_DWORD FPF_SKIANormalizeFontName(const CFX_ByteStringC& bsfamily) { - FX_DWORD dwHash = 0; - int32_t iLength = bsfamily.GetLength(); - const FX_CHAR* pBuffer = bsfamily.GetCStr(); - for (int32_t i = 0; i < iLength; i++) { - FX_CHAR ch = pBuffer[i]; - if (ch == ' ' || ch == '-' || ch == ',') { - continue; - } - dwHash = 31 * dwHash + FXSYS_tolower(ch); - } - return dwHash; -} -static FX_DWORD FPF_SKIAGetFamilyHash(const CFX_ByteStringC& bsFamily, - FX_DWORD dwStyle, - uint8_t uCharset) { - CFX_ByteString bsFont(bsFamily); - if (dwStyle & FXFONT_BOLD) { - bsFont += "Bold"; - } - if (dwStyle & FXFONT_ITALIC) { - bsFont += "Italic"; - } - if (dwStyle & FXFONT_SERIF) { - bsFont += "Serif"; - } - bsFont += uCharset; - return FPF_GetHashCode_StringA(bsFont.c_str(), bsFont.GetLength(), TRUE); -} -static FX_BOOL FPF_SkiaIsCJK(uint8_t uCharset) { - return (uCharset == FXFONT_GB2312_CHARSET) || - (uCharset == FXFONT_CHINESEBIG5_CHARSET) || - (uCharset == FXFONT_HANGEUL_CHARSET) || - (uCharset == FXFONT_SHIFTJIS_CHARSET); -} -static FX_BOOL FPF_SkiaMaybeSymbol(const CFX_ByteStringC& bsFacename) { - CFX_ByteString bsName = bsFacename; - bsName.MakeLower(); - return bsName.Find("symbol") > -1; -} -static FX_BOOL FPF_SkiaMaybeArabic(const CFX_ByteStringC& bsFacename) { - CFX_ByteString bsName = bsFacename; - bsName.MakeLower(); - return bsName.Find("arabic") > -1; -} -CFPF_SkiaFontMgr::CFPF_SkiaFontMgr() : m_bLoaded(FALSE), m_FTLibrary(NULL) {} -CFPF_SkiaFontMgr::~CFPF_SkiaFontMgr() { - for (const auto& pair : m_FamilyFonts) { - if (pair.second) - pair.second->Release(); - } - m_FamilyFonts.clear(); - for (auto it = m_FontFaces.rbegin(); it != m_FontFaces.rend(); ++it) { - delete *it; - } - m_FontFaces.clear(); - if (m_FTLibrary) { - FXFT_Done_FreeType(m_FTLibrary); - } -} -FX_BOOL CFPF_SkiaFontMgr::InitFTLibrary() { - if (!m_FTLibrary) { - FXFT_Init_FreeType(&m_FTLibrary); - } - return m_FTLibrary != NULL; -} -void CFPF_SkiaFontMgr::LoadSystemFonts() { - if (m_bLoaded) { - return; - } - ScanPath("/system/fonts"); - OutputSystemFonts(); - m_bLoaded = TRUE; -} -void CFPF_SkiaFontMgr::LoadPrivateFont(IFX_FileRead* pFontFile) {} -void CFPF_SkiaFontMgr::LoadPrivateFont(const CFX_ByteStringC& bsFileName) {} -void CFPF_SkiaFontMgr::LoadPrivateFont(void* pBuffer, size_t szBuffer) {} -IFPF_Font* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname, - uint8_t uCharset, - FX_DWORD dwStyle, - FX_DWORD dwMatch) { - FX_DWORD dwHash = FPF_SKIAGetFamilyHash(bsFamilyname, dwStyle, uCharset); - auto it = m_FamilyFonts.find(dwHash); - if (it != m_FamilyFonts.end() && it->second) - return it->second->Retain(); - - FX_DWORD dwFaceName = FPF_SKIANormalizeFontName(bsFamilyname); - FX_DWORD dwSubst = FPF_SkiaGetSubstFont(dwFaceName); - FX_DWORD dwSubstSans = FPF_SkiaGetSansFont(dwFaceName); - FX_BOOL bMaybeSymbol = FPF_SkiaMaybeSymbol(bsFamilyname); - if (uCharset != FXFONT_ARABIC_CHARSET && FPF_SkiaMaybeArabic(bsFamilyname)) { - uCharset = FXFONT_ARABIC_CHARSET; - } else if (uCharset == FXFONT_ANSI_CHARSET && - (dwMatch & FPF_MATCHFONT_REPLACEANSI)) { - uCharset = FXFONT_DEFAULT_CHARSET; - } - int32_t nExpectVal = FPF_SKIAMATCHWEIGHT_NAME1 + FPF_SKIAMATCHWEIGHT_1 * 3 + - FPF_SKIAMATCHWEIGHT_2 * 2; - int32_t nItem = -1; - int32_t nMax = -1; - int32_t nGlyphNum = 0; - for (auto it = m_FontFaces.rbegin(); it != m_FontFaces.rend(); ++it) { - CFPF_SkiaPathFont* pFontDes = static_cast<CFPF_SkiaPathFont*>(*it); - if (!(pFontDes->m_dwCharsets & FPF_SkiaGetCharset(uCharset))) { - continue; - } - int32_t nFind = 0; - FX_DWORD dwSysFontName = FPF_SKIANormalizeFontName(pFontDes->m_pFamily); - if (dwFaceName == dwSysFontName) { - nFind += FPF_SKIAMATCHWEIGHT_NAME1; - } - bool bMatchedName = (nFind == FPF_SKIAMATCHWEIGHT_NAME1); - if ((dwStyle & FXFONT_BOLD) == (pFontDes->m_dwStyle & FXFONT_BOLD)) { - nFind += FPF_SKIAMATCHWEIGHT_1; - } - if ((dwStyle & FXFONT_ITALIC) == (pFontDes->m_dwStyle & FXFONT_ITALIC)) { - nFind += FPF_SKIAMATCHWEIGHT_1; - } - if ((dwStyle & FXFONT_FIXED_PITCH) == - (pFontDes->m_dwStyle & FXFONT_FIXED_PITCH)) { - nFind += FPF_SKIAMATCHWEIGHT_2; - } - if ((dwStyle & FXFONT_SERIF) == (pFontDes->m_dwStyle & FXFONT_SERIF)) { - nFind += FPF_SKIAMATCHWEIGHT_1; - } - if ((dwStyle & FXFONT_SCRIPT) == (pFontDes->m_dwStyle & FXFONT_SCRIPT)) { - nFind += FPF_SKIAMATCHWEIGHT_2; - } - if (dwSubst == dwSysFontName || dwSubstSans == dwSysFontName) { - nFind += FPF_SKIAMATCHWEIGHT_NAME2; - bMatchedName = true; - } - if (uCharset == FXFONT_DEFAULT_CHARSET || bMaybeSymbol) { - if (nFind > nMax && bMatchedName) { - nMax = nFind; - nItem = it - m_FontFaces.rbegin(); - } - } else if (FPF_SkiaIsCJK(uCharset)) { - if (bMatchedName || pFontDes->m_iGlyphNum > nGlyphNum) { - nItem = it - m_FontFaces.rbegin(); - nGlyphNum = pFontDes->m_iGlyphNum; - } - } else if (nFind > nMax) { - nMax = nFind; - nItem = it - m_FontFaces.rbegin(); - } - if (nExpectVal <= nFind) { - nItem = it - m_FontFaces.rbegin(); - break; - } - } - if (nItem > -1) { - CFPF_SkiaFontDescriptor* pFontDes = m_FontFaces[nItem]; - CFPF_SkiaFont* pFont = new CFPF_SkiaFont; - if (pFont->InitFont(this, pFontDes, bsFamilyname, dwStyle, uCharset)) { - m_FamilyFonts[dwHash] = pFont; - return pFont->Retain(); - } - pFont->Release(); - } - return NULL; -} -FXFT_Face CFPF_SkiaFontMgr::GetFontFace(IFX_FileRead* pFileRead, - int32_t iFaceIndex) { - if (!pFileRead) { - return NULL; - } - if (pFileRead->GetSize() == 0) { - return NULL; - } - if (iFaceIndex < 0) { - return NULL; - } - FXFT_StreamRec streamRec; - FXSYS_memset(&streamRec, 0, sizeof(FXFT_StreamRec)); - streamRec.size = pFileRead->GetSize(); - streamRec.descriptor.pointer = pFileRead; - streamRec.read = FPF_SkiaStream_Read; - streamRec.close = FPF_SkiaStream_Close; - FXFT_Open_Args args; - args.flags = FT_OPEN_STREAM; - args.stream = &streamRec; - FXFT_Face face; - if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) { - return NULL; - } - FXFT_Set_Pixel_Sizes(face, 0, 64); - return face; -} -FXFT_Face CFPF_SkiaFontMgr::GetFontFace(const CFX_ByteStringC& bsFile, - int32_t iFaceIndex) { - if (bsFile.IsEmpty()) { - return NULL; - } - if (iFaceIndex < 0) { - return NULL; - } - FXFT_Open_Args args; - args.flags = FT_OPEN_PATHNAME; - args.pathname = (FT_String*)bsFile.GetCStr(); - FXFT_Face face; - if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) { - return FALSE; - } - FXFT_Set_Pixel_Sizes(face, 0, 64); - return face; -} -FXFT_Face CFPF_SkiaFontMgr::GetFontFace(const uint8_t* pBuffer, - size_t szBuffer, - int32_t iFaceIndex) { - if (!pBuffer || szBuffer < 1) { - return NULL; - } - if (iFaceIndex < 0) { - return NULL; - } - FXFT_Open_Args args; - args.flags = FT_OPEN_MEMORY; - args.memory_base = pBuffer; - args.memory_size = szBuffer; - FXFT_Face face; - if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) { - return FALSE; - } - FXFT_Set_Pixel_Sizes(face, 0, 64); - return face; -} -void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) { - void* handle = FX_OpenFolder(path.GetCStr()); - if (!handle) { - return; - } - CFX_ByteString filename; - FX_BOOL bFolder = FALSE; - while (FX_GetNextFile(handle, filename, bFolder)) { - if (bFolder) { - if (filename == "." || filename == "..") { - continue; - } - } else { - CFX_ByteString ext = filename.Right(4); - ext.MakeLower(); - if (ext != ".ttf" && ext != ".ttc" && ext != ".otf") { - continue; - } - } - CFX_ByteString fullpath = path; - fullpath += "/"; - fullpath += filename; - if (bFolder) { - ScanPath(fullpath); - } else { - ScanFile(fullpath); - } - } - FX_CloseFolder(handle); -} -void CFPF_SkiaFontMgr::ScanFile(const CFX_ByteStringC& file) { - FXFT_Face face = GetFontFace(file); - if (face) { - CFPF_SkiaPathFont* pFontDesc = new CFPF_SkiaPathFont; - pFontDesc->SetPath(file.GetCStr()); - ReportFace(face, pFontDesc); - m_FontFaces.push_back(pFontDesc); - FXFT_Done_Face(face); - } -} -static const FX_DWORD g_FPFSkiaFontCharsets[] = { - FPF_SKIACHARSET_Ansi, - FPF_SKIACHARSET_EeasternEuropean, - FPF_SKIACHARSET_Cyrillic, - FPF_SKIACHARSET_Greek, - FPF_SKIACHARSET_Turkish, - FPF_SKIACHARSET_Hebrew, - FPF_SKIACHARSET_Arabic, - FPF_SKIACHARSET_Baltic, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - FPF_SKIACHARSET_Thai, - FPF_SKIACHARSET_ShiftJIS, - FPF_SKIACHARSET_GB2312, - FPF_SKIACHARSET_Korean, - FPF_SKIACHARSET_BIG5, - FPF_SKIACHARSET_Johab, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - FPF_SKIACHARSET_OEM, - FPF_SKIACHARSET_Symbol, -}; -static FX_DWORD FPF_SkiaGetFaceCharset(TT_OS2* pOS2) { - FX_DWORD dwCharset = 0; - if (pOS2) { - for (int32_t i = 0; i < 32; i++) { - if (pOS2->ulCodePageRange1 & (1 << i)) { - dwCharset |= g_FPFSkiaFontCharsets[i]; - } - } - } - dwCharset |= FPF_SKIACHARSET_Default; - return dwCharset; -} -void CFPF_SkiaFontMgr::ReportFace(FXFT_Face face, - CFPF_SkiaFontDescriptor* pFontDesc) { - if (!face || !pFontDesc) { - return; - } - pFontDesc->SetFamily(FXFT_Get_Face_Family_Name(face)); - if (FXFT_Is_Face_Bold(face)) { - pFontDesc->m_dwStyle |= FXFONT_BOLD; - } - if (FXFT_Is_Face_Italic(face)) { - pFontDesc->m_dwStyle |= FXFONT_ITALIC; - } - if (FT_IS_FIXED_WIDTH(face)) { - pFontDesc->m_dwStyle |= FXFONT_FIXED_PITCH; - } - TT_OS2* pOS2 = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2); - if (pOS2) { - if (pOS2->ulCodePageRange1 & (1 << 31)) { - pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC; - } - if (pOS2->panose[0] == 2) { - uint8_t uSerif = pOS2->panose[1]; - if ((uSerif > 1 && uSerif < 10) || uSerif > 13) { - pFontDesc->m_dwStyle |= FXFONT_SERIF; - } - } - } - if (pOS2 && (pOS2->ulCodePageRange1 & (1 << 31))) { - pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC; - } - pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2); - pFontDesc->m_iFaceIndex = face->face_index; - pFontDesc->m_iGlyphNum = face->num_glyphs; -} -void CFPF_SkiaFontMgr::OutputSystemFonts() {} -#endif diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h deleted file mode 100644 index 1a304e578a..0000000000 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ /dev/null @@ -1,127 +0,0 @@ -// 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 CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ -#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include <map> -#include <vector> - -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_font.h" - -#define FPF_SKIAFONTTYPE_Unknown 0 -#define FPF_SKIAFONTTYPE_Path 1 -#define FPF_SKIAFONTTYPE_File 2 -#define FPF_SKIAFONTTYPE_Buffer 3 - -class CFPF_SkiaFont; - -class CFPF_SkiaFontDescriptor { - public: - CFPF_SkiaFontDescriptor() - : m_pFamily(NULL), - m_dwStyle(0), - m_iFaceIndex(0), - m_dwCharsets(0), - m_iGlyphNum(0) {} - virtual ~CFPF_SkiaFontDescriptor() { FX_Free(m_pFamily); } - - virtual int32_t GetType() const { return FPF_SKIAFONTTYPE_Unknown; } - - void SetFamily(const FX_CHAR* pFamily) { - FX_Free(m_pFamily); - int32_t iSize = FXSYS_strlen(pFamily); - m_pFamily = FX_Alloc(FX_CHAR, iSize + 1); - FXSYS_memcpy(m_pFamily, pFamily, iSize * sizeof(FX_CHAR)); - m_pFamily[iSize] = 0; - } - FX_CHAR* m_pFamily; - FX_DWORD m_dwStyle; - int32_t m_iFaceIndex; - FX_DWORD m_dwCharsets; - int32_t m_iGlyphNum; -}; - -class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor { - public: - CFPF_SkiaPathFont() : m_pPath(NULL) {} - ~CFPF_SkiaPathFont() override { FX_Free(m_pPath); } - - // CFPF_SkiaFontDescriptor - int32_t GetType() const override { return FPF_SKIAFONTTYPE_Path; } - - void SetPath(const FX_CHAR* pPath) { - FX_Free(m_pPath); - int32_t iSize = FXSYS_strlen(pPath); - m_pPath = FX_Alloc(FX_CHAR, iSize + 1); - FXSYS_memcpy(m_pPath, pPath, iSize * sizeof(FX_CHAR)); - m_pPath[iSize] = 0; - } - FX_CHAR* m_pPath; -}; - -class CFPF_SkiaFileFont : public CFPF_SkiaFontDescriptor { - public: - CFPF_SkiaFileFont() : m_pFile(NULL) {} - - // CFPF_SkiaFontDescriptor - int32_t GetType() const override { return FPF_SKIAFONTTYPE_File; } - IFX_FileRead* m_pFile; -}; - -class CFPF_SkiaBufferFont : public CFPF_SkiaFontDescriptor { - public: - CFPF_SkiaBufferFont() : m_pBuffer(NULL), m_szBuffer(0) {} - - // CFPF_SkiaFontDescriptor - int32_t GetType() const override { return FPF_SKIAFONTTYPE_Buffer; } - - void* m_pBuffer; - size_t m_szBuffer; -}; - -class CFPF_SkiaFontMgr : public IFPF_FontMgr { - public: - CFPF_SkiaFontMgr(); - ~CFPF_SkiaFontMgr() override; - - // IFPF_FontMgr - void LoadSystemFonts() override; - void LoadPrivateFont(IFX_FileRead* pFontFile) override; - void LoadPrivateFont(const CFX_ByteStringC& bsFileName) override; - void LoadPrivateFont(void* pBuffer, size_t szBuffer) override; - IFPF_Font* CreateFont(const CFX_ByteStringC& bsFamilyname, - uint8_t uCharset, - FX_DWORD dwStyle, - FX_DWORD dwMatch = 0) override; - - FX_BOOL InitFTLibrary(); - FXFT_Face GetFontFace(IFX_FileRead* pFileRead, int32_t iFaceIndex = 0); - FXFT_Face GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0); - FXFT_Face GetFontFace(const uint8_t* pBuffer, - size_t szBuffer, - int32_t iFaceIndex = 0); - - protected: - void ScanPath(const CFX_ByteStringC& path); - void ScanFile(const CFX_ByteStringC& file); - void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc); - void OutputSystemFonts(); - - FX_BOOL m_bLoaded; - FXFT_Library m_FTLibrary; - std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces; - std::map<FX_DWORD, CFPF_SkiaFont*> m_FamilyFonts; -}; - -#endif - -#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp deleted file mode 100644 index 76ee853602..0000000000 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// 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 - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/src/fxge/android/fpf_skiafontmgr.h" -#include "core/src/fxge/android/fpf_skiamodule.h" - -static IFPF_DeviceModule* gs_pPFModule = NULL; -IFPF_DeviceModule* FPF_GetDeviceModule() { - if (!gs_pPFModule) { - gs_pPFModule = new CFPF_SkiaDeviceModule; - } - return gs_pPFModule; -} -CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() { - delete m_pFontMgr; -} -void CFPF_SkiaDeviceModule::Destroy() { - delete (CFPF_SkiaDeviceModule*)gs_pPFModule; - gs_pPFModule = NULL; -} -IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { - if (!m_pFontMgr) { - m_pFontMgr = new CFPF_SkiaFontMgr; - if (!m_pFontMgr->InitFTLibrary()) { - delete m_pFontMgr; - return NULL; - } - } - return (IFPF_FontMgr*)m_pFontMgr; -} -#endif diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h deleted file mode 100644 index ff99eda75d..0000000000 --- a/core/src/fxge/android/fpf_skiamodule.h +++ /dev/null @@ -1,30 +0,0 @@ -// 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 CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ -#define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/include/fxge/fpf.h" - -class CFPF_SkiaFontMgr; - -class CFPF_SkiaDeviceModule : public IFPF_DeviceModule { - public: - CFPF_SkiaDeviceModule() : m_pFontMgr(nullptr) {} - ~CFPF_SkiaDeviceModule() override; - - // IFPF_DeviceModule - void Destroy() override; - IFPF_FontMgr* GetFontMgr() override; - - protected: - CFPF_SkiaFontMgr* m_pFontMgr; -}; -#endif - -#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp deleted file mode 100644 index f28bf286e5..0000000000 --- a/core/src/fxge/android/fx_android_font.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// 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 - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/include/fxge/fpf.h" -#include "core/src/fxge/android/fx_android_font.h" - -CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {} -FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) { - if (!pFontMgr) { - return FALSE; - } - pFontMgr->LoadSystemFonts(); - m_pFontMgr = pFontMgr; - return TRUE; -} -FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) { - return FALSE; -} -void* CFX_AndroidFontInfo::MapFont(int weight, - FX_BOOL bItalic, - int charset, - int pitch_family, - const FX_CHAR* face, - int& iExact) { - if (!m_pFontMgr) { - return NULL; - } - FX_DWORD dwStyle = 0; - if (weight >= 700) { - dwStyle |= FXFONT_BOLD; - } - if (bItalic) { - dwStyle |= FXFONT_ITALIC; - } - if (pitch_family & FXFONT_FF_FIXEDPITCH) { - dwStyle |= FXFONT_FIXED_PITCH; - } - if (pitch_family & FXFONT_FF_SCRIPT) { - dwStyle |= FXFONT_SCRIPT; - } - if (pitch_family & FXFONT_FF_ROMAN) { - dwStyle |= FXFONT_SERIF; - } - return m_pFontMgr->CreateFont(face, charset, dwStyle, - FPF_MATCHFONT_REPLACEANSI); -} -void* CFX_AndroidFontInfo::GetFont(const FX_CHAR* face) { - return NULL; -} -FX_DWORD CFX_AndroidFontInfo::GetFontData(void* hFont, - FX_DWORD table, - uint8_t* buffer, - FX_DWORD size) { - if (!hFont) { - return 0; - } - return ((IFPF_Font*)hFont)->GetFontData(table, buffer, size); -} -FX_BOOL CFX_AndroidFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) { - if (!hFont) { - return FALSE; - } - name = ((IFPF_Font*)hFont)->GetFamilyName(); - return TRUE; -} -FX_BOOL CFX_AndroidFontInfo::GetFontCharset(void* hFont, int& charset) { - if (!hFont) { - return FALSE; - } - charset = ((IFPF_Font*)hFont)->GetCharset(); - return FALSE; -} -void CFX_AndroidFontInfo::DeleteFont(void* hFont) { - if (!hFont) { - return; - } - ((IFPF_Font*)hFont)->Release(); -} -void* CFX_AndroidFontInfo::RetainFont(void* hFont) { - return NULL; -} -#endif diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h deleted file mode 100644 index 0ebc97d096..0000000000 --- a/core/src/fxge/android/fx_android_font.h +++ /dev/null @@ -1,49 +0,0 @@ -// 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 CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ -#define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/include/fxge/fx_font.h" - -class IFPF_FontMgr; - -class CFX_AndroidFontInfo : public IFX_SystemFontInfo { - public: - CFX_AndroidFontInfo(); - virtual void Release() { delete this; } - - virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); - - virtual void* MapFont(int weight, - FX_BOOL bItalic, - int charset, - int pitch_family, - const FX_CHAR* face, - int& bExact); - - virtual void* GetFont(const FX_CHAR* face); - virtual FX_DWORD GetFontData(void* hFont, - FX_DWORD table, - uint8_t* 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); - - protected: - IFPF_FontMgr* m_pFontMgr; -}; -#endif - -#endif // CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp deleted file mode 100644 index 271e0012d8..0000000000 --- a/core/src/fxge/android/fx_android_imp.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// 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 - -#include "core/include/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_ANDROID_ - -#include "core/include/fxge/fpf.h" -#include "core/include/fxge/fx_ge.h" -#include "core/src/fxge/android/fx_android_font.h" - -void CFX_GEModule::InitPlatform() { - IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule(); - if (!pDeviceModule) { - return; - } - IFPF_FontMgr* pFontMgr = pDeviceModule->GetFontMgr(); - if (pFontMgr) { - CFX_AndroidFontInfo* pFontInfo = new CFX_AndroidFontInfo; - pFontInfo->Init(pFontMgr); - m_pFontMgr->SetSystemFontInfo(pFontInfo); - } - m_pPlatformData = pDeviceModule; -} -void CFX_GEModule::DestroyPlatform() { - if (m_pPlatformData) { - ((IFPF_DeviceModule*)m_pPlatformData)->Destroy(); - } -} - -#endif |