Index: core/src/fxge/ge/fx_ge_text.cpp |
diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp |
index 440ecdd6961875eb3134d83306a0925b41d6e6aa..0724c10edfe2468dfa91c3e936e7b2b1b2fb782c 100644 |
--- a/core/src/fxge/ge/fx_ge_text.cpp |
+++ b/core/src/fxge/ge/fx_ge_text.cpp |
@@ -135,10 +135,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, const FXTEXT_CHARPOS* pChar |
if (!(text_flags & FXTEXT_PRINTGRAPHICTEXT)) { |
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ |
if (!(text_flags & FXFONT_CIDFONT) && pFont->GetPsName().Find(CFX_WideString::FromLocal("+ZJHL")) == -1) |
-#ifdef FOXIT_CHROME_BUILD |
if (pFont->GetPsName() != CFX_WideString::FromLocal("CNAAJI+cmex10")) |
#endif |
-#endif |
if (m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache, pText2Device, font_size, fill_color, alpha_flag, pIccTransform)) { |
return TRUE; |
} |
@@ -150,10 +148,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, const FXTEXT_CHARPOS* pChar |
} else if (!(text_flags & FXTEXT_NO_NATIVETEXT)) { |
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ |
if (!(text_flags & FXFONT_CIDFONT)) |
-#ifdef FOXIT_CHROME_BUILD |
if (pFont->GetPsName() != CFX_WideString::FromLocal("CNAAJI+cmex10")) |
#endif |
-#endif |
if (m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache, pText2Device, font_size, fill_color, alpha_flag, pIccTransform)) { |
return TRUE; |
} |
@@ -1070,7 +1066,7 @@ CFX_FaceCache::~CFX_FaceCache() |
} |
m_PathMap.RemoveAll(); |
} |
-#if ((_FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_)|| defined(_FPDFAPI_MINI_)) |
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ |
void CFX_FaceCache::InitPlatform() |
{ |
} |
@@ -1105,7 +1101,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD |
return NULL; |
} |
_CFX_UniqueKeyGen keygen; |
-#if ((_FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_)|| defined(_FPDFAPI_MINI_)) |
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ |
if (pFont->GetSubstFont()) |
keygen.Generate(9, (int)(pMatrix->a * 10000), (int)(pMatrix->b * 10000), |
(int)(pMatrix->c * 10000), (int)(pMatrix->d * 10000), dest_width, anti_alias, |
@@ -1133,7 +1129,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD |
} |
#endif |
CFX_ByteStringC FaceGlyphsKey(keygen.m_Key, keygen.m_KeyLen); |
-#if ((_FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_)|| defined(_FPDFAPI_MINI_)) |
+#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ |
return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey, glyph_index, bFontStyle, dest_width, anti_alias); |
#else |
if (text_flags & FXTEXT_NO_NATIVETEXT) { |
@@ -1186,11 +1182,7 @@ CFX_SizeGlyphCache::~CFX_SizeGlyphCache() |
} |
m_GlyphMap.RemoveAll(); |
} |
-#if defined(_FPDFAPI_MINI_) |
-#define CONTRAST_RAMP_STEP 16 |
-#else |
#define CONTRAST_RAMP_STEP 1 |
-#endif |
void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) |
{ |
FXFT_MM_Var pMasters = NULL; |