diff options
author | Martin Robinson <mrobinson@igalia.com> | 2025-01-14 14:54:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-14 13:54:06 +0000 |
commit | 0e616e0c5d2bef8a6de1df25f2419a435837ed63 (patch) | |
tree | 71a3c54941f8283e58b5d6477f6b0a9aebe044d9 /components/fonts/system_font_service.rs | |
parent | c4c85affb50419af4b70c42fcb1f03dea3527044 (diff) | |
download | servo-0e616e0c5d2bef8a6de1df25f2419a435837ed63.tar.gz servo-0e616e0c5d2bef8a6de1df25f2419a435837ed63.zip |
api: Flatten and simplify Servo preferences (#34966)
Flatten and simplify Servo's preferences code. In addition, have both
preferences and options passed in as arguments to `Servo::new()` and
make sure not to use the globally set preferences in `servoshell` (as
much as possible now).
Instead of a complex procedural macro to generate preferences, just
expose a very simple derive macro that adds string based getters and
setters.
- All command-line parsing is moved to servoshell.
- There is no longer the concept of a missing preference.
- Preferences no longer have to be part of the resources bundle because
they now have reasonable default values.
- servoshell specific preferences are no longer part of the preferences
exposed by the Servo API.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/fonts/system_font_service.rs')
-rw-r--r-- | components/fonts/system_font_service.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/fonts/system_font_service.rs b/components/fonts/system_font_service.rs index 42acc5ab85b..b29eca6b86c 100644 --- a/components/fonts/system_font_service.rs +++ b/components/fonts/system_font_service.rs @@ -323,10 +323,10 @@ impl SystemFontService { .get_or_init(|| { // First check whether the font is set in the preferences. let family_name = match generic { - GenericFontFamily::None => pref!(fonts.default), - GenericFontFamily::Serif => pref!(fonts.serif), - GenericFontFamily::SansSerif => pref!(fonts.sans_serif), - GenericFontFamily::Monospace => pref!(fonts.monospace), + GenericFontFamily::None => pref!(fonts_default), + GenericFontFamily::Serif => pref!(fonts_serif), + GenericFontFamily::SansSerif => pref!(fonts_sans_serif), + GenericFontFamily::Monospace => pref!(fonts_monospace), _ => String::new(), }; |