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

Explicitly allocate and deallocate our initial computed values.

Browse source 
This allows us to trigger style struct destructors before Gecko's leak checking
runs.
This commit is contained in:
Bobby Holley 2016-08-02 22:03:15 -07:00
parent 9b92d0bc3a
commit f0f39904a2
3 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/style/properties/gecko.mako.rs
View file

@ -100,7 +100,30 @@ impl ComputedValues {
ComputedValues::inherit_from(parent)
}
pub fn initial_values() -> &'static Self { &*INITIAL_GECKO_VALUES }
pub fn initial_values() -> &'static Self {
unsafe {
debug_assert!(!INITIAL_GECKO_VALUES.is_null());
&*INITIAL_GECKO_VALUES
}
}
pub unsafe fn initialize() {
debug_assert!(INITIAL_GECKO_VALUES.is_null());
INITIAL_GECKO_VALUES = Box::into_raw(Box::new(ComputedValues {
% for style_struct in data.style_structs:
${style_struct.ident}: style_structs::${style_struct.name}::initial(),
% endfor
custom_properties: None,
shareable: true,
writing_mode: WritingMode::empty(),
root_font_size: longhands::font_size::get_initial_value(),
}));
}
pub unsafe fn shutdown() {
debug_assert!(!INITIAL_GECKO_VALUES.is_null());
let _ = Box::from_raw(INITIAL_GECKO_VALUES);
}
#[inline]
pub fn do_cascade_property<F: FnOnce(&[CascadePropertyFn])>(f: F) {
@ -1338,17 +1361,7 @@ ${impl_style_struct(style_struct)}
${define_ffi_struct_accessor(style_struct)}
% endfor
lazy_static! {
pub static ref INITIAL_GECKO_VALUES: ComputedValues = ComputedValues {
% for style_struct in data.style_structs:
${style_struct.ident}: style_structs::${style_struct.name}::initial(),
% endfor
custom_properties: None,
shareable: true,
writing_mode: WritingMode::empty(),
root_font_size: longhands::font_size::get_initial_value(),
};
}
static mut INITIAL_GECKO_VALUES: *mut ComputedValues = 0 as *mut ComputedValues;
static CASCADE_PROPERTY: [CascadePropertyFn; ${len(data.longhands)}] = [
% for property in data.longhands: