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

style: Remove some uses of StyleBuilder::for_derived_style.

Browse source 
for_derived_style(default_values) is effectively for_inheritance(default_values).

MozReview-Commit-ID: DfTeD49uTlp
This commit is contained in:
Emilio Cobos Álvarez 2018-02-02 15:00:32 +01:00
parent 1662fd7357
commit 7fb470c373
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ports/geckolib/glue.rs
View file

@ -2318,30 +2318,19 @@ pub extern "C" fn Servo_ComputedValues_Inherit(
let atom = Atom::from(pseudo_tag);
let pseudo = PseudoElement::from_anon_box_atom(&atom)
.expect("Not an anon-box? Gah!");
let style = if let Some(reference) = parent_style_context {
let mut style = StyleBuilder::for_inheritance(
data.stylist.device(),
reference,
Some(&pseudo)
);
let device = data.stylist.device();
if for_text {
StyleAdjuster::new(&mut style)
.adjust_for_text();
}
let mut style = StyleBuilder::for_inheritance(
data.stylist.device(),
parent_style_context.unwrap_or_else(|| device.default_computed_values()),
Some(&pseudo)
);
style.build()
} else {
debug_assert!(!for_text);
StyleBuilder::for_derived_style(
data.stylist.device(),
data.default_computed_values(),
/* parent_style = */ None,
Some(&pseudo),
).build()
};
if for_text {
StyleAdjuster::new(&mut style).adjust_for_text();
}
style.into()
style.build().into()
}
#[no_mangle]