Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-02 17:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade stylo to 2024-05-15 (#32334)

Browse source 
* Upgrade stylo to 2024-05-15

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

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

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

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

* hashbrown and indexmap are no longer duplicated
This commit is contained in:
Oriol Brufau 2024-05-27 17:24:34 +02:00 • committed by GitHub
parent 43a3c9c319
commit 453ac11e3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 47 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/wrapper.rs
View file

@ -105,7 +105,7 @@ where
let style = self.as_element().unwrap().resolved_style();
return TextContent::GeneratedContent(match style.as_ref().get_counters().content {
Content::Items(ref value) => value.to_vec(),
Content::Items(ref value) => value.items.to_vec(),
_ => vec![],
});
}

2
components/layout_2020/dom_traversal.rs
View file

@ -366,7 +366,7 @@ where
match &pseudo_element_style.get_counters().content {
Content::Items(ref items) => {
let mut vec = vec![];
for item in items.iter() {
for item in items.items.iter() {
match item {
ContentItem::String(s) => {
vec.push(PseudoElementContentItem::Text(s.to_string()));

2
components/layout_thread/lib.rs
View file

@ -1397,7 +1397,7 @@ impl LayoutThread {
);
// Preserve any previously computed root font size.
device.set_root_font_size(self.stylist.device().root_font_size());
device.set_root_font_size(self.stylist.device().root_font_size().px());
let sheet_origins_affected_by_device_change = self.stylist.set_device(device, guards);
self.stylist

2
components/layout_thread_2020/lib.rs
View file

@ -1029,7 +1029,7 @@ impl LayoutThread {
);
// Preserve any previously computed root font size.
device.set_root_font_size(self.stylist.device().root_font_size());
device.set_root_font_size(self.stylist.device().root_font_size().px());
let sheet_origins_affected_by_device_change = self.stylist.set_device(device, guards);
self.stylist