From 08e707273ef50c3a2365ff976e96e761800016d3 Mon Sep 17 00:00:00 2001 From: thestig Date: Fri, 1 Jul 2016 10:24:51 -0700 Subject: Clean up CFX_MacFontInfo and surrounding code. Review-Url: https://codereview.chromium.org/2112213002 --- core/fxge/apple/apple_int.h | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) (limited to 'core/fxge/apple/apple_int.h') diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h index 0462938d5a..07484a46cd 100644 --- a/core/fxge/apple/apple_int.h +++ b/core/fxge/apple/apple_int.h @@ -18,40 +18,6 @@ #include #endif -typedef enum eFXIOSFONTCHARSET { - eFXFontCharsetDEFAULT = 0, - eFXFontCharsetANSI = 1, - eFXFontCharsetSYMBOL = 1 << 1, - eFXFontCharsetSHIFTJIS = 1 << 2, - eFXFontCharsetHANGEUL = 1 << 3, - eFXFontCharsetGB2312 = 1 << 4, - eFXFontCharsetCHINESEBIG5 = 1 << 5, - eFXFontCharsetTHAI = 1 << 6, - eFXFontCharsetEASTEUROPE = 1 << 7, - eFXFontCharsetRUSSIAN = 1 << 8, - eFXFontCharsetGREEK = 1 << 9, - eFXFontCharsetTURKISH = 1 << 10, - eFXFontCharsetHEBREW = 1 << 11, - eFXFontCharsetARABIC = 1 << 12, - eFXFontCharsetBALTIC = 1 << 13, -} FX_IOSCHARSET; - -FX_IOSCHARSET FX_GetiOSCharset(int charset); -typedef enum eFXIOSFONTFLAG { - eFXFontFlagBold = 1, - eFXFontFlagItalic = 1 << 1, - eFXFontFlagFixedPitch = 1 << 2, - eFXFontFlagSerif = 1 << 3, - eFXFontFlagScript = 1 << 4, -} FX_IOSFONTFLAG; - -typedef struct IOS_FONTDATA_ { - uint32_t nHashCode; - const char* psName; - uint32_t charsets; - uint32_t styles; -} IOS_FONTDATA; - class CQuartz2D { public: void* createGraphics(CFX_DIBitmap* bitmap); @@ -180,11 +146,6 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { int32_t m_horzSize; int32_t m_vertSize; }; - -uint32_t FX_GetHashCode(const FX_CHAR* pStr); -uint32_t FX_IOSGetMatchFamilyNameHashcode(const FX_CHAR* pFontName); -uint32_t FX_IOSGetFamilyNamesCount(); -const FX_CHAR* FX_IOSGetFamilyName(uint32_t uIndex); -#endif +#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #endif // CORE_FXGE_APPLE_APPLE_INT_H_ -- cgit v1.2.3