Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 01:15:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2023-12-01 (#32032)

Browse source 
* Upgrade Stylo to 2023-12-01

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

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

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

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

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

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

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

* Update test expectations
This commit is contained in:
Oriol Brufau 2024-04-10 15:03:56 +02:00 • committed by GitHub
parent 89a4820519
commit 5acfce5b89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 88 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/unit/style/custom_properties.rs
View file

@ -12,13 +12,17 @@ use style::custom_properties::{
use style::font_metrics::FontMetrics;
use style::media_queries::{Device, MediaType};
use style::properties::style_structs::Font;
use style::properties::{CustomDeclaration, CustomDeclarationValue};
use style::properties::{CustomDeclaration, CustomDeclarationValue, StyleBuilder};
use style::rule_cache::RuleCacheConditions;
use style::rule_tree::CascadeLevel;
use style::servo::media_queries::FontMetricsProvider;
use style::stylesheets::container_rule::ContainerSizeQuery;
use style::stylesheets::layer_rule::LayerOrder;
use style::stylesheets::UrlExtraData;
use style::stylist::Stylist;
use style::values::computed::Length;
use style::values::computed::{Context, Length};
use test::{self, Bencher};
use url::Url;
#[derive(Debug)]
struct DummyMetricsProvider;
@ -40,13 +44,16 @@ fn cascade(
name_and_value: &[(&str, &str)],
inherited: &ComputedCustomProperties,
) -> ComputedCustomProperties {
let dummy_url_data = UrlExtraData::from(Url::parse("about:blank").unwrap());
let declarations = name_and_value
.iter()
.map(|&(name, value)| {
let mut input = ParserInput::new(value);
let mut parser = Parser::new(&mut input);
let name = Name::from(name);
let value = CustomDeclarationValue::Value(SpecifiedValue::parse(&mut parser).unwrap());
let value = CustomDeclarationValue::Value(
SpecifiedValue::parse(&mut parser, &dummy_url_data).unwrap(),
);
CustomDeclaration { name, value }
})
.collect::<Vec<_>>();
@ -59,7 +66,16 @@ fn cascade(
Box::new(DummyMetricsProvider),
);
let stylist = Stylist::new(device, QuirksMode::NoQuirks);
let mut builder = CustomPropertiesBuilder::new(inherited, &stylist, false);
let mut builder = StyleBuilder::new(stylist.device(), Some(&stylist), None, None, None, false);
builder.custom_properties = inherited.clone();
let mut rule_cache_conditions = RuleCacheConditions::default();
let context = Context::new(
builder,
stylist.quirks_mode(),
&mut rule_cache_conditions,
ContainerSizeQuery::none(),
);
let mut builder = CustomPropertiesBuilder::new(&stylist, &context);
for declaration in &declarations {
builder.cascade(