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/layout_thread | |
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/layout_thread')
-rw-r--r-- | components/layout_thread/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 1a5630293b3..d0eae9afb45 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -520,7 +520,7 @@ impl LayoutThread { compositor_api.send_initial_transaction(id.into()); let mut font = Font::initial_values(); - let default_font_size = pref!(fonts.default_size); + let default_font_size = pref!(fonts_default_size); font.font_size = FontSize { computed_size: NonNegativeLength::new(default_font_size as f32), used_size: NonNegativeLength::new(default_font_size as f32), @@ -1519,8 +1519,8 @@ impl FontMetricsProvider for LayoutFontMetricsProvider { fn base_size_for_generic(&self, generic: GenericFontFamily) -> Length { Length::new(match generic { - GenericFontFamily::Monospace => pref!(fonts.default_monospace_size), - _ => pref!(fonts.default_size), + GenericFontFamily::Monospace => pref!(fonts_default_monospace_size), + _ => pref!(fonts_default_size), } as f32) .max(Length::new(0.0)) } |