Bug 1872784 - Remove layout.css.font-display.enabled pref r=jfkthame,webidl,smaug

Differential Revision: https://phabricator.services.mozilla.com/D197558
2024-01-09 20:44:39 +00:00 · 2024-01-09 20:44:39 +00:00 · 7b6b8a038f
--- a/dom/webidl/FontFace.webidl
+++ b/dom/webidl/FontFace.webidl
@ -20,7 +20,7 @@ dictionary FontFaceDescriptors {
  UTF8String variant = "normal";
  UTF8String featureSettings = "normal";
  [Pref="layout.css.font-variations.enabled"] UTF8String variationSettings = "normal";
-  [Pref="layout.css.font-display.enabled"] UTF8String display = "auto";
+  UTF8String display = "auto";
  UTF8String ascentOverride = "normal";
  UTF8String descentOverride = "normal";
  UTF8String lineGapOverride = "normal";
@ -44,7 +44,7 @@ interface FontFace {
  [SetterThrows] attribute UTF8String variant;
  [SetterThrows] attribute UTF8String featureSettings;
  [SetterThrows, Pref="layout.css.font-variations.enabled"] attribute UTF8String variationSettings;
-  [SetterThrows, Pref="layout.css.font-display.enabled"] attribute UTF8String display;
+  [SetterThrows] attribute UTF8String display;
  [SetterThrows] attribute UTF8String ascentOverride;
  [SetterThrows] attribute UTF8String descentOverride;
  [SetterThrows] attribute UTF8String lineGapOverride;
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@ -156,10 +156,6 @@ nsCSSFontDesc nsCSSProps::LookupFontDesc(const nsACString& aFontDesc) {
  MOZ_ASSERT(gFontDescTable, "no lookup table, needs addref");
  nsCSSFontDesc which = nsCSSFontDesc(gFontDescTable->Lookup(aFontDesc));

-  if (which == eCSSFontDesc_Display &&
-      !StaticPrefs::layout_css_font_display_enabled()) {
-    which = eCSSFontDesc_UNKNOWN;
-  }
  return which;
 }

--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@ -372,9 +372,6 @@ void nsFontFaceLoader::Cancel() {
 }

 StyleFontDisplay nsFontFaceLoader::GetFontDisplay() {
-  if (!StaticPrefs::layout_css_font_display_enabled()) {
-    return StyleFontDisplay::Auto;
-  }
  return mUserFontEntry->GetFontDisplay();
 }

--- a/layout/style/test/test_descriptor_storage.html
+++ b/layout/style/test/test_descriptor_storage.html
@ -110,8 +110,7 @@ function runTest() {
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestLongerTimeout(5);

-SpecialPowers.pushPrefEnv({ set: [["layout.css.font-display.enabled", true]] },
-                          runTest);
+runTest();

 </script>
 </pre>
--- a/layout/style/test/test_font_face_parser.html
+++ b/layout/style/test/test_font_face_parser.html
@ -378,8 +378,9 @@ function runTest() {
 }

 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({ set: [["layout.css.font-display.enabled", true]] },
-                          runTest);
+
+runTest();
+
 </script>
 </body>
 </html>
--- a/layout/style/test/test_font_loading_api.html
+++ b/layout/style/test/test_font_loading_api.html
@ -6,7 +6,7 @@

 <script src=descriptor_database.js></script>

-<body onload="start()">
+<body onload="runTest()">
 <iframe id=v src="file_font_loading_api_vframe.html"></iframe>
 <iframe id=n style="display: none"></iframe>

@ -1886,10 +1886,6 @@ function runTest() {
  });
 }

-function start() {
-  SpecialPowers.pushPrefEnv({ set: [["layout.css.font-display.enabled", true]] }, runTest);
-}
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestLongerTimeout(5);

--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@ -96,7 +96,7 @@
 #
 # - `rust` indicates if the mirror variable is used by Rust code. If so, it
 #   will be usable via the `static_prefs::pref!` macro, e.g.
-#   `static_prefs::pref!("layout.css.font-display.enabled")`.
+#   `static_prefs::pref!("layout.css.cross-fade.enabled")`.
 #
 # The getter function's base name is the same as the pref's name, but with
 # '.' or '-' chars converted to '_', to make a valid identifier. For example,
@ -8433,13 +8433,6 @@
 #endif
  mirror: always

-# Is support for the font-display @font-face descriptor enabled?
- name: layout.css.font-display.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-  rust: true
-
 # Is support for the @font-palette-values rule and font-palette property enabled?
 - name: layout.css.font-palette.enabled
  type: RelaxedAtomicBool
--- a/servo/components/style/font_face.rs
+++ b/servo/components/style/font_face.rs
@ -614,9 +614,6 @@ impl Parse for Source {
 }

 macro_rules! is_descriptor_enabled {
-    ("font-display") => {
-        static_prefs::pref!("layout.css.font-display.enabled")
-    };
    ("font-variation-settings") => {
        static_prefs::pref!("layout.css.font-variations.enabled")
    };