Skip to content
Permalink
Browse files
style: Make CASCADE_PROPERTY a real static array.
Why wasn't this done before?
  • Loading branch information
emilio committed Jun 30, 2016
1 parent d3a1a4e commit 2faaf952c7ce8cf177838f03c3719c75e2245cf8
Showing with 17 additions and 24 deletions.
  1. +9 −16 components/style/properties/properties.mako.rs
  2. +8 −8 ports/geckolib/properties.mako.rs
@@ -1275,7 +1275,7 @@ pub trait ComputedValues : Debug + Clone + Send + Sync + 'static {

fn initial_values() -> &'static Self;

fn do_cascade_property<F: FnOnce(&Vec<CascadePropertyFn<Self>>)>(f: F);
fn do_cascade_property<F: FnOnce(&[CascadePropertyFn<Self>])>(f: F);

% for style_struct in data.active_style_structs():
fn clone_${style_struct.trait_name_lower}(&self) ->
@@ -1346,8 +1346,9 @@ impl ComputedValues for ServoComputedValues {

fn initial_values() -> &'static Self { &*INITIAL_SERVO_VALUES }

fn do_cascade_property<F: FnOnce(&Vec<CascadePropertyFn<Self>>)>(f: F) {
CASCADE_PROPERTY.with(|x| f(x));
#[inline]
fn do_cascade_property<F: FnOnce(&[CascadePropertyFn<Self>])>(f: F) {
f(&CASCADE_PROPERTY)
}

% for style_struct in data.active_style_structs():
@@ -1747,19 +1748,11 @@ pub type CascadePropertyFn<C /*: ComputedValues */> =
cacheable: &mut bool,
error_reporter: &mut StdBox<ParseErrorReporter + Send>);

pub fn make_cascade_vec<C: ComputedValues>() -> Vec<CascadePropertyFn<C>> {
vec![
% for property in data.longhands:
longhands::${property.ident}::cascade_property,
% endfor
]
}

// This is a thread-local rather than a lazy static to avoid atomic operations when cascading
// properties.
thread_local!(static CASCADE_PROPERTY: Vec<CascadePropertyFn<ServoComputedValues>> = {
make_cascade_vec::<ServoComputedValues>()
});
static CASCADE_PROPERTY: [CascadePropertyFn<ServoComputedValues>; ${len(data.longhands)}] = [
% for property in data.longhands:
longhands::${property.ident}::cascade_property,
% endfor
];

/// Performs the CSS cascade, computing new styles for an element from its parent style and
/// optionally a cached related style. The arguments are:
@@ -33,7 +33,6 @@ use style::custom_properties::ComputedValuesMap;
use style::logical_geometry::WritingMode;
use style::properties::{CascadePropertyFn, ServoComputedValues, ComputedValues};
use style::properties::longhands;
use style::properties::make_cascade_vec;
use style::properties::style_struct_traits::*;
use values::{StyleCoordHelpers, ToGeckoStyleCoord, convert_nscolor_to_rgba};
use values::{convert_rgba_to_nscolor, debug_assert_unit_is_safe_to_copy};
@@ -106,8 +105,9 @@ impl ComputedValues for GeckoComputedValues {

fn initial_values() -> &'static Self { &*INITIAL_GECKO_VALUES }

fn do_cascade_property<F: FnOnce(&Vec<CascadePropertyFn<Self>>)>(f: F) {
CASCADE_PROPERTY.with(|x| f(x));
#[inline]
fn do_cascade_property<F: FnOnce(&[CascadePropertyFn<Self>])>(f: F) {
f(&CASCADE_PROPERTY)
}

% for style_struct in data.style_structs:
@@ -1139,8 +1139,8 @@ lazy_static! {
};
}

// This is a thread-local rather than a lazy static to avoid atomic operations when cascading
// properties.
thread_local!(static CASCADE_PROPERTY: Vec<CascadePropertyFn<GeckoComputedValues>> = {
make_cascade_vec::<GeckoComputedValues>()
});
static CASCADE_PROPERTY: [CascadePropertyFn<GeckoComputedValues>; ${len(data.longhands)}] = [
% for property in data.longhands:
longhands::${property.ident}::cascade_property,
% endfor
];

0 comments on commit 2faaf95

Please sign in to comment.