Bug 1561792 - Rename the pref gfx.font_ahem_antialias_none to gfx.font_rendering.ahem_antialias_none to avoid the additional pref observer added in the previous patch. r=jfkthame

Differential Revision: https://phabricator.services.mozilla.com/D41068

--HG--
extra : moz-landing-system : lando

gfx/thebes/gfxFont.cpp

@@ -770,7 +770,7 @@ gfxFont::gfxFont(const RefPtr<UnscaledFont>& aUnscaledFont,
 #endif
 
   // Turn off AA for Ahem for testing purposes when requested.
-  if (MOZ_UNLIKELY(StaticPrefs::gfx_font_ahem_antialias_none() &&
+  if (MOZ_UNLIKELY(StaticPrefs::gfx_font_rendering_ahem_antialias_none() &&
                    mFontEntry->FamilyName().EqualsLiteral("Ahem"))) {
     mAntialiasOption = kAntialiasNone;
   }

gfx/thebes/gfxMacFont.cpp

@@ -146,7 +146,7 @@ gfxMacFont::gfxMacFont(const RefPtr<UnscaledFontMac>& aUnscaledFont,
   if ((mAdjustedSize <=
        (gfxFloat)gfxPlatformMac::GetPlatform()->GetAntiAliasingThreshold()) ||
       // Turn off AA for Ahem for testing purposes when requested.
-      MOZ_UNLIKELY(StaticPrefs::gfx_font_ahem_antialias_none() &&
+      MOZ_UNLIKELY(StaticPrefs::gfx_font_rendering_ahem_antialias_none() &&
                    mFontEntry->FamilyName().EqualsLiteral("Ahem"))) {
     cairo_font_options_set_antialias(fontOptions, CAIRO_ANTIALIAS_NONE);
     mAntialiasOption = kAntialiasNone;

gfx/thebes/gfxPlatform.cpp

@@ -443,7 +443,7 @@ SRGBOverrideObserver::Observe(nsISupports* aSubject, const char* aTopic,
 
 static const char* kObservedPrefs[] = {"gfx.downloadable_fonts.",
                                        "gfx.font_rendering.", BIDI_NUMERAL_PREF,
-                                       "gfx.font_ahem_antialias_none", nullptr};
+                                       nullptr};
 
 static void FontPrefChanged(const char* aPref, void* aData) {
   MOZ_ASSERT(aPref);
@@ -2281,7 +2281,7 @@ void gfxPlatform::FontsPrefsChanged(const char* aPref) {
 #if defined(XP_MACOSX)
       !strcmp(GFX_PREF_CORETEXT_SHAPING, aPref) ||
 #endif
-      !strcmp("gfx.font_ahem_antialias_none", aPref)) {
+      !strcmp("gfx.font_rendering.ahem_antialias_none", aPref)) {
     FlushFontAndWordCaches();
   } else if (!strcmp(BIDI_NUMERAL_PREF, aPref)) {
     mBidiNumeralOption = UNINITIALIZED_VALUE;

layout/reftests/w3c-css/submitted/variables/reftest.list

@@ -58,11 +58,11 @@
 == variable-declaration-59.html support/color-green-ref.html
 == variable-declaration-60.html support/color-green-ref.html
 == variable-external-declaration-01.html support/color-green-ref.html
-ref-pref(gfx.font_ahem_antialias_none,false) == variable-external-font-face-01.html variable-external-font-face-01-ref.html
+ref-pref(gfx.font_rendering.ahem_antialias_none,false) == variable-external-font-face-01.html variable-external-font-face-01-ref.html
 == variable-external-reference-01.html support/color-green-ref.html
 == variable-external-supports-01.html support/color-green-ref.html
-ref-pref(gfx.font_ahem_antialias_none,false) == variable-font-face-01.html variable-font-face-01-ref.html
-ref-pref(gfx.font_ahem_antialias_none,false) == variable-font-face-02.html variable-font-face-02-ref.html
+ref-pref(gfx.font_rendering.ahem_antialias_none,false) == variable-font-face-01.html variable-font-face-01-ref.html
+ref-pref(gfx.font_rendering.ahem_antialias_none,false) == variable-font-face-02.html variable-font-face-02-ref.html
 == variable-reference-01.html support/color-green-ref.html
 == variable-reference-02.html support/color-green-ref.html
 == variable-reference-03.html support/color-green-ref.html

layout/tools/reftest/runreftest.py

@@ -358,7 +358,7 @@ class RefTest(object):
         prefs['reftest.focusFilterMode'] = options.focusFilterMode
         prefs['reftest.logLevel'] = options.log_tbpl_level or 'info'
         prefs['reftest.suite'] = options.suite
-        prefs['gfx.font_ahem_antialias_none'] = True
+        prefs['gfx.font_rendering.ahem_antialias_none'] = True
 
         # Set tests to run or manifests to parse.
         if tests:

modules/libpref/init/StaticPrefList.yaml

@@ -2848,7 +2848,7 @@
   value: false
   mirror: once
 
-- name: gfx.font_ahem_antialias_none
+- name: gfx.font_rendering.ahem_antialias_none
   type: RelaxedAtomicBool
   value: false
   mirror: always

modules/libpref/init/all.js

@@ -872,7 +872,7 @@ pref("gfx.font_rendering.directwrite.use_gdi_table_loading", true);
 #endif
 
 // Disable antialiasing of Ahem, for use in tests
-pref("gfx.font_ahem_antialias_none", false);
+pref("gfx.font_rendering.ahem_antialias_none", false);
 
 #ifdef XP_WIN
 // comma separated list of backends to use in order of preference

testing/profiles/web-platform/user.js

@@ -23,7 +23,7 @@ user_pref("places.history.enabled", false);
 // Suppress automatic safe mode after crashes
 user_pref("toolkit.startup.max_resumed_crashes", -1);
 // Disable antialiasing for the Ahem font.
-user_pref("gfx.font_ahem_antialias_none", true);
+user_pref("gfx.font_rendering.ahem_antialias_none", true);
 // Disable antiphishing popup
 user_pref("network.http.phishy-userpass-length", 255);
 // Disable safebrowsing components