From 10215d3497e394a453913912bb6993ad8086596b Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 22 Feb 2018 20:55:39 +0000 Subject: [PATCH] Bug 1440411 - Remove the obsolete gfx.font_loader.families_per_slice pref (no longer used by any code). r=jrmuizel --- gfx/thebes/gfxPlatformFontList.cpp | 6 +----- gfx/thebes/gfxPlatformFontList.h | 1 - modules/libpref/init/all.js | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index bd75ac57151c..0ade9195757a 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -95,7 +95,6 @@ const gfxFontEntry::ScriptRange gfxPlatformFontList::sComplexScriptRanges[] = { }; // prefs for the font info loader -#define FONT_LOADER_FAMILIES_PER_SLICE_PREF "gfx.font_loader.families_per_slice" #define FONT_LOADER_DELAY_PREF "gfx.font_loader.delay" #define FONT_LOADER_INTERVAL_PREF "gfx.font_loader.interval" @@ -187,7 +186,7 @@ gfxPlatformFontList::MemoryReporter::CollectReports( gfxPlatformFontList::gfxPlatformFontList(bool aNeedFullnamePostscriptNames) : mFontFamiliesMutex("gfxPlatformFontList::mFontFamiliesMutex"), mFontFamilies(64), mOtherFamilyNames(16), mBadUnderlineFamilyNames(8), mSharedCmaps(8), - mStartIndex(0), mIncrement(1), mNumFamilies(0), mFontlistInitCount(0), + mStartIndex(0), mNumFamilies(0), mFontlistInitCount(0), mFontFamilyWhitelistActive(false) { mOtherFamilyNamesInitialized = false; @@ -1683,9 +1682,6 @@ gfxPlatformFontList::CleanupLoader() void gfxPlatformFontList::GetPrefsAndStartLoader() { - mIncrement = - std::max(1u, Preferences::GetUint(FONT_LOADER_FAMILIES_PER_SLICE_PREF)); - uint32_t delay = std::max(1u, Preferences::GetUint(FONT_LOADER_DELAY_PREF)); uint32_t interval = diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h index f82ca4d2071d..3626827e37eb 100644 --- a/gfx/thebes/gfxPlatformFontList.h +++ b/gfx/thebes/gfxPlatformFontList.h @@ -589,7 +589,6 @@ protected: // data used as part of the font cmap loading process nsTArray > mFontFamiliesToLoad; uint32_t mStartIndex; - uint32_t mIncrement; uint32_t mNumFamilies; // xxx - info for diagnosing no default font aborts diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 1035e3b613e0..40b0196e5f3f 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -853,7 +853,6 @@ pref("gfx.bundled_fonts.force-enabled", false); pref("gfx.missing_fonts.notify", false); // prefs controlling the font (name/cmap) loader that runs shortly after startup -pref("gfx.font_loader.families_per_slice", 3); // read in info 3 families at a time #ifdef XP_WIN pref("gfx.font_loader.delay", 120000); // 2 minutes after startup pref("gfx.font_loader.interval", 1000); // every 1 second until complete