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

Bug 1298588 part 6, servo piece. Stop using initial_values when doing inheritance in Gecko glue code. r=bholley

Browse source
This commit is contained in:
Boris Zbarsky 2017-01-04 13:44:08 -05:00
parent 56941d61a7
commit c313c8d17e
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ports/geckolib/glue.rs
View file

@ -581,13 +581,16 @@ fn get_pseudo_style(element: GeckoElement, pseudo_tag: *mut nsIAtom,
}
#[no_mangle]
pub extern "C" fn Servo_ComputedValues_Inherit(parent_style: ServoComputedValuesBorrowedOrNull)
pub extern "C" fn Servo_ComputedValues_Inherit(
raw_data: RawServoStyleSetBorrowed,
parent_style: ServoComputedValuesBorrowedOrNull)
-> ServoComputedValuesStrong {
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
let maybe_arc = ComputedValues::arc_from_borrowed(&parent_style);
let style = if let Some(reference) = maybe_arc.as_ref() {
ComputedValues::inherit_from(reference)
ComputedValues::inherit_from(reference, &data.default_computed_values)
} else {
Arc::new(ComputedValues::initial_values().clone())
data.default_computed_values.clone()
};
style.into_strong()
}