Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2024-11-01 (#34322)

Browse source 
* Upgrade Stylo to 2024-11-01

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Fixup for https://phabricator.services.mozilla.com/D224747

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Update test expectations

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-11-21 16:14:45 +01:00 • committed by GitHub
parent a6db3cb702
commit 97f53021b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 44 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/text.rs
View file

@ -188,6 +188,7 @@ impl TextRunScanner {
{
let in_fragment = self.clump.front().unwrap();
let font_style = in_fragment.style().clone_font();
let computed_font_size = font_style.font_size.computed_size();
let inherited_text_style = in_fragment.style().get_inherited_text();
font_group = font_context.font_group(font_style);
compression = match in_fragment.white_space_collapse() {
@ -198,7 +199,10 @@ impl TextRunScanner {
WhiteSpaceCollapse::PreserveBreaks => CompressionMode::CompressWhitespace,
};
text_transform = inherited_text_style.text_transform;
letter_spacing = inherited_text_style.letter_spacing;
letter_spacing = inherited_text_style
.letter_spacing
.0
.resolve(computed_font_size);
word_spacing = inherited_text_style
.word_spacing
.to_length()
@ -337,7 +341,7 @@ impl TextRunScanner {
// example, `finally` with a wide `letter-spacing` renders as `f i n a l l y` and not
// `fi n a l l y`.
let mut flags = ShapingFlags::empty();
if letter_spacing.0.px() != 0. {
if letter_spacing.px() != 0. {
flags.insert(ShapingFlags::IGNORE_LIGATURES_SHAPING_FLAG);
}
if text_rendering == TextRendering::Optimizespeed {
@ -348,10 +352,10 @@ impl TextRunScanner {
flags.insert(ShapingFlags::KEEP_ALL_FLAG);
}
let options = ShapingOptions {
letter_spacing: if letter_spacing.0.px() == 0. {
letter_spacing: if letter_spacing.px() == 0. {
None
} else {
Some(Au::from(letter_spacing.0))
Some(Au::from(letter_spacing))
},
word_spacing,
script: Script::Common,