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

Auto merge of #12725 - bholley:fix_leaks, r=emilio

Browse source 
stylo: fix leaks, and accept null in Servo_InheritComputedValues

This corresponds to changes in:

https://bugzilla.mozilla.org/show_bug.cgi?id=1291885
and
https://bugzilla.mozilla.org/show_bug.cgi?id=1291891

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12725)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-03 20:20:21 -05:00 • committed by GitHub
commit 939e0a5f89
4 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
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) {
@ -236,7 +259,7 @@ def set_gecko_property(ffi_name, expr):
// In the longer term, Gecko should store currentColor as a computed
// value, so that we don't need to do this:
// https://bugzilla.mozilla.org/show_bug.cgi?id=760345
unimplemented!();
warn!("stylo: mishandling currentColor");
% endif
</%def>
@ -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: