Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 04:58:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 663688 - back out changeset c4b84b05c46c to revert the workaround that disabled downloadable fonts on Lion. r=jdaggett

Browse Source
This commit is contained in:
Jonathan Kew 2011-06-29 14:16:12 +01:00
parent fba7575d35
commit e9e59d071d
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/thebes/gfxPlatform.cpp
View File

@ -151,9 +151,6 @@ SRGBOverrideObserver::Observe(nsISupports *aSubject,
}
#define GFX_DOWNLOADABLE_FONTS_ENABLED "gfx.downloadable_fonts.enabled"
#if defined(XP_MACOSX)
#define GFX_DOWNLOADABLE_FONTS_ENABLED_LION "gfx.downloadable_fonts.enabled.lion"
#endif
#define GFX_DOWNLOADABLE_FONTS_SANITIZE "gfx.downloadable_fonts.sanitize"
#define GFX_PREF_HARFBUZZ_SCRIPTS "gfx.font_rendering.harfbuzz.scripts"
@ -531,21 +528,8 @@ PRBool
gfxPlatform::DownloadableFontsEnabled()
{
if (mAllowDownloadableFonts == UNINITIALIZED_VALUE) {
#if defined(XP_MACOSX)
// Work around a serious bug in how Apple handles downloaded fonts
// on the most recent developer previews of OS X 10.7 (Lion, builds
// 11A480b and 11A494a). See bug 663688.
if (gfxPlatformMac::GetPlatform()->OSXVersion() >= 0x1070) {
mAllowDownloadableFonts =
Preferences::GetBool(GFX_DOWNLOADABLE_FONTS_ENABLED_LION, PR_FALSE);
} else {
mAllowDownloadableFonts =
Preferences::GetBool(GFX_DOWNLOADABLE_FONTS_ENABLED, PR_FALSE);
}
#else
mAllowDownloadableFonts =
Preferences::GetBool(GFX_DOWNLOADABLE_FONTS_ENABLED, PR_FALSE);
#endif
}
return mAllowDownloadableFonts;

8
modules/libpref/src/init/all.js
View File

@ -196,14 +196,6 @@ pref("gfx.downloadable_fonts.enabled", true);
pref("gfx.downloadable_fonts.fallback_delay", 3000);
pref("gfx.downloadable_fonts.sanitize", true);
// Needed to work around a serious bug in how Apple handles downloaded fonts
// on the most recent developer previews of OS X 10.7 (Lion, builds 11A480b
// and 11A494a). See bug 663688. On Lion and up this setting overrides
// gfx.downloadable_fonts.enabled.
#ifdef XP_MACOSX
pref("gfx.downloadable_fonts.enabled.lion", false);
#endif
// see gfx/thebes/gfxUnicodeProperties.h for definitions of script bits
#ifdef XP_MACOSX
// use harfbuzz for default (0x01) + arabic (0x02) + hebrew (0x04)