From fd41056ca5f78ebf379c1975c88f508223062760 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Mon, 22 May 2023 11:03:30 +0200
Subject: [PATCH] Further changes required by Servo

---
 components/atoms/static_atoms.txt        | 1 +
 components/canvas/canvas_data.rs         | 2 ++
 components/gfx/font.rs                   | 1 +
 components/style/values/computed/font.rs | 7 ++++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/atoms/static_atoms.txt b/components/atoms/static_atoms.txt
index bdb16e30e78..8409639055f 100644
--- a/components/atoms/static_atoms.txt
+++ b/components/atoms/static_atoms.txt
@@ -127,6 +127,7 @@ stroke-opacity
 storage
 submit
 suspend
+system-ui
 tel
 text
 time
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
index 31c74f1e7a4..ac00083d44e 100644
--- a/components/canvas/canvas_data.rs
+++ b/components/canvas/canvas_data.rs
@@ -1387,6 +1387,8 @@ fn to_font_kit_family(font_family: &font::SingleFontFamily) -> FamilyName {
             font::GenericFontFamily::Monospace => FamilyName::Monospace,
             font::GenericFontFamily::Fantasy => FamilyName::Fantasy,
             font::GenericFontFamily::Cursive => FamilyName::Cursive,
+            // TODO: There is no FontFamily::SystemUi.
+            font::GenericFontFamily::SystemUi => unreachable!("system-ui should be disabled"),
             font::GenericFontFamily::None => unreachable!("Shouldn't appear in computed values"),
         },
     }
diff --git a/components/gfx/font.rs b/components/gfx/font.rs
index d53f6761b66..05ffb897a4e 100644
--- a/components/gfx/font.rs
+++ b/components/gfx/font.rs
@@ -569,6 +569,7 @@ impl<'a> From<&'a SingleFontFamily> for FontFamilyName {
                 GenericFontFamily::Monospace => atom!("monospace"),
                 GenericFontFamily::Cursive => atom!("cursive"),
                 GenericFontFamily::Fantasy => atom!("fantasy"),
+                GenericFontFamily::SystemUi => atom!("system-ui"),
             }),
         }
     }
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index 9d7ba40c0bd..d4818fb0e97 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -387,7 +387,10 @@ pub enum SingleFontFamily {
 }
 
 fn system_ui_enabled(_: &ParserContext) -> bool {
-    static_prefs::pref!("layout.css.system-ui.enabled")
+    #[cfg(feature = "gecko")]
+    return static_prefs::pref!("layout.css.system-ui.enabled");
+    #[cfg(feature = "servo")]
+    return false;
 }
 
 /// A generic font-family name.
@@ -501,6 +504,7 @@ impl SingleFontFamily {
             atom!("cursive") => return SingleFontFamily::Generic(GenericFontFamily::Cursive),
             atom!("fantasy") => return SingleFontFamily::Generic(GenericFontFamily::Fantasy),
             atom!("monospace") => return SingleFontFamily::Generic(GenericFontFamily::Monospace),
+            atom!("system-ui") => return SingleFontFamily::Generic(GenericFontFamily::SystemUi),
             _ => {},
         }
 
@@ -510,6 +514,7 @@ impl SingleFontFamily {
             "cursive" => return SingleFontFamily::Generic(GenericFontFamily::Cursive),
             "fantasy" => return SingleFontFamily::Generic(GenericFontFamily::Fantasy),
             "monospace" => return SingleFontFamily::Generic(GenericFontFamily::Monospace),
+            "system-ui" => return SingleFontFamily::Generic(GenericFontFamily::SystemUi),
             _ => {}
         }