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

style: Cleanup the cascade a good bit.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-07-20 11:20:37 +02:00
parent b70cbeb84c
commit e374a54050
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
20 changed files with 286 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ports/geckolib/glue.rs
View file

@ -1688,7 +1688,6 @@ fn get_pseudo_style(
StyleBuilder::for_inheritance(
doc_data.stylist.device(),
styles.primary(),
doc_data.default_computed_values(),
Some(pseudo),
).build()
}))
@ -1711,7 +1710,6 @@ pub extern "C" fn Servo_ComputedValues_Inherit(
let mut style = StyleBuilder::for_inheritance(
data.stylist.device(),
reference,
data.default_computed_values(),
Some(&pseudo)
);
@ -1726,6 +1724,7 @@ pub extern "C" fn Servo_ComputedValues_Inherit(
StyleBuilder::for_derived_style(
data.stylist.device(),
data.default_computed_values(),
/* parent_style = */ None,
Some(&pseudo),
).build()
};
@ -2885,20 +2884,21 @@ fn simulate_compute_values_failure(_: &PropertyValuePair) -> bool {
false
}
fn create_context<'a>(per_doc_data: &'a PerDocumentStyleDataImpl,
font_metrics_provider: &'a FontMetricsProvider,
style: &'a ComputedValues,
parent_style: Option<&'a ComputedValues>,
pseudo: Option<&'a PseudoElement>)
-> Context<'a> {
let default_values = per_doc_data.default_computed_values();
let inherited_style = parent_style.unwrap_or(default_values);
fn create_context<'a>(
per_doc_data: &'a PerDocumentStyleDataImpl,
font_metrics_provider: &'a FontMetricsProvider,
style: &'a ComputedValues,
parent_style: Option<&'a ComputedValues>,
pseudo: Option<&'a PseudoElement>,
) -> Context<'a> {
Context {
is_root_element: false,
device: per_doc_data.stylist.device(),
inherited_style: inherited_style,
style: StyleBuilder::for_derived_style(per_doc_data.stylist.device(), style, pseudo),
builder: StyleBuilder::for_derived_style(
per_doc_data.stylist.device(),
style,
parent_style,
pseudo,
),
font_metrics_provider: font_metrics_provider,
cached_system_font: None,
in_media_query: false,