diff options
Diffstat (limited to 'components/style/properties')
| -rw-r--r-- | components/style/properties/data.py | 22 | ||||
| -rw-r--r-- | components/style/properties/declaration_block.rs | 10 | ||||
| -rw-r--r-- | components/style/properties/helpers/animated_properties.mako.rs | 316 | ||||
| -rw-r--r-- | components/style/properties/longhand/box.mako.rs | 2 | ||||
| -rw-r--r-- | components/style/properties/properties.mako.rs | 18 |
5 files changed, 216 insertions, 152 deletions
diff --git a/components/style/properties/data.py b/components/style/properties/data.py index 15d9f2fc89a..c0510d0c13f 100644 --- a/components/style/properties/data.py +++ b/components/style/properties/data.py @@ -194,12 +194,15 @@ class Longhand(object): self.animation_value_type = animation_value_type self.animatable = animation_value_type != "none" + self.transitionable = animation_value_type != "none" \ + and animation_value_type != "discrete" self.is_animatable_with_computed_value = animation_value_type == "ComputedValue" \ or animation_value_type == "discrete" if self.logical: # Logical properties will be animatable (i.e. the animation type is # discrete). For now, it is still non-animatable. self.animatable = False + self.transitionable = False self.animation_type = None # NB: Animatable implies clone because a property animation requires a # copy of the computed value. @@ -234,6 +237,25 @@ class Shorthand(object): self.allowed_in_keyframe_block = allowed_in_keyframe_block \ and allowed_in_keyframe_block != "False" + def get_animatable(self): + animatable = False + for sub in self.sub_properties: + if sub.animatable: + animatable = True + break + return animatable + + def get_transitionable(self): + transitionable = False + for sub in self.sub_properties: + if sub.transitionable: + transitionable = True + break + return transitionable + + animatable = property(get_animatable) + transitionable = property(get_transitionable) + class Method(object): def __init__(self, name, return_type=None, arg_types=None, is_mut=False): diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs index efbccd9f991..bcbb26771a9 100644 --- a/components/style/properties/declaration_block.rs +++ b/components/style/properties/declaration_block.rs @@ -126,7 +126,7 @@ impl<'a, 'cx, 'cx_a:'cx> AnimationValueIterator<'a, 'cx, 'cx_a> { } impl<'a, 'cx, 'cx_a:'cx> Iterator for AnimationValueIterator<'a, 'cx, 'cx_a> { - type Item = (TransitionProperty, AnimationValue); + type Item = (AnimatableLonghand, AnimationValue); #[inline] fn next(&mut self) -> Option<Self::Item> { use properties::Importance; @@ -136,11 +136,11 @@ impl<'a, 'cx, 'cx_a:'cx> Iterator for AnimationValueIterator<'a, 'cx, 'cx_a> { match next { Some(&(ref decl, importance)) => { if importance == Importance::Normal { - let property = TransitionProperty::from_declaration(decl); + let property = AnimatableLonghand::from_declaration(decl); let animation = AnimationValue::from_declaration(decl, &mut self.context, self.default_values); debug_assert!(property.is_none() == animation.is_none(), - "The failure condition of TransitionProperty::from_declaration \ + "The failure condition of AnimatableLonghand::from_declaration \ and AnimationValue::from_declaration should be the same"); // Skip the property if either ::from_declaration fails. match (property, animation) { @@ -201,7 +201,7 @@ impl PropertyDeclarationBlock { } } - /// Return an iterator of (TransitionProperty, AnimationValue). + /// Return an iterator of (AnimatableLonghand, AnimationValue). pub fn to_animation_value_iter<'a, 'cx, 'cx_a:'cx>(&'a self, context: &'cx mut Context<'cx_a>, default_values: &'a Arc<ComputedValues>) @@ -554,7 +554,7 @@ impl PropertyDeclarationBlock { let mut longhands = LonghandIdSet::new(); for (property, animation_value) in animation_value_map.iter() { - longhands.set_transition_property_bit(property); + longhands.set_animatable_longhand_bit(property); declarations.push((animation_value.uncompute(), Importance::Normal)); } diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index 857c0b10491..dfc55107435 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/components/style/properties/helpers/animated_properties.mako.rs @@ -46,28 +46,152 @@ use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius; use values::generics::position as generic_position; -/// A given transition property, that is either `All`, or an animatable -/// property. +/// A longhand property whose animation type is not "none". +/// +/// NOTE: This includes the 'display' property since it is animatable from SMIL even though it is +/// not animatable from CSS animations or Web Animations. CSS transitions also does not allow +/// animating 'display', but for CSS transitions we have the separate TransitionProperty type. +#[derive(Clone, Debug, PartialEq, Eq, Hash)] +#[cfg_attr(feature = "servo", derive(HeapSizeOf))] +pub enum AnimatableLonghand { + % for prop in data.longhands: + % if prop.animatable: + /// ${prop.name} + ${prop.camel_case}, + % endif + % endfor +} + +impl AnimatableLonghand { + /// Returns true if this AnimatableLonghand is one of the discretely animatable properties. + pub fn is_discrete(&self) -> bool { + match *self { + % for prop in data.longhands: + % if prop.animation_value_type == "discrete": + AnimatableLonghand::${prop.camel_case} => true, + % endif + % endfor + _ => false + } + } + + /// Converts from an nsCSSPropertyID. Returns None if nsCSSPropertyID is not an animatable + /// longhand in Servo. + #[cfg(feature = "gecko")] + pub fn from_nscsspropertyid(css_property: nsCSSPropertyID) -> Option<Self> { + match css_property { + % for prop in data.longhands: + % if prop.animatable: + ${helpers.to_nscsspropertyid(prop.ident)} + => Some(AnimatableLonghand::${prop.camel_case}), + % endif + % endfor + _ => None + } + } + + /// Converts from TransitionProperty. Returns None if the property is not an animatable + /// longhand. + pub fn from_transition_property(transition_property: &TransitionProperty) -> Option<Self> { + match *transition_property { + % for prop in data.longhands: + % if prop.transitionable and prop.animatable: + TransitionProperty::${prop.camel_case} + => Some(AnimatableLonghand::${prop.camel_case}), + % endif + % endfor + _ => None + } + } + + /// Get an animatable longhand property from a property declaration. + pub fn from_declaration(declaration: &PropertyDeclaration) -> Option<Self> { + use properties::LonghandId; + match *declaration { + % for prop in data.longhands: + % if prop.animatable: + PropertyDeclaration::${prop.camel_case}(..) + => Some(AnimatableLonghand::${prop.camel_case}), + % endif + % endfor + PropertyDeclaration::CSSWideKeyword(id, _) | + PropertyDeclaration::WithVariables(id, _) => { + match id { + % for prop in data.longhands: + % if prop.animatable: + LonghandId::${prop.camel_case} => + Some(AnimatableLonghand::${prop.camel_case}), + % endif + % endfor + _ => None, + } + }, + _ => None, + } + } +} + +/// Convert to nsCSSPropertyID. +#[cfg(feature = "gecko")] +#[allow(non_upper_case_globals)] +impl<'a> From< &'a AnimatableLonghand> for nsCSSPropertyID { + fn from(property: &'a AnimatableLonghand) -> nsCSSPropertyID { + match *property { + % for prop in data.longhands: + % if prop.animatable: + AnimatableLonghand::${prop.camel_case} + => ${helpers.to_nscsspropertyid(prop.ident)}, + % endif + % endfor + } + } +} + +/// Convert to PropertyDeclarationId. +#[cfg(feature = "gecko")] +#[allow(non_upper_case_globals)] +impl<'a> From<AnimatableLonghand> for PropertyDeclarationId<'a> { + fn from(property: AnimatableLonghand) -> PropertyDeclarationId<'a> { + match property { + % for prop in data.longhands: + % if prop.animatable: + AnimatableLonghand::${prop.camel_case} + => PropertyDeclarationId::Longhand(LonghandId::${prop.camel_case}), + % endif + % endfor + } + } +} + +/// Returns true if this nsCSSPropertyID is one of the animatable properties. +#[cfg(feature = "gecko")] +pub fn nscsspropertyid_is_animatable(property: nsCSSPropertyID) -> bool { + match property { + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.animatable: + ${helpers.to_nscsspropertyid(prop.ident)} => true, + % endif + % endfor + _ => false + } +} + +/// A given transition property, that is either `All`, a transitionable longhand property, +/// a shorthand with at least one transitionable longhand component, or an unsupported property. // NB: This needs to be here because it needs all the longhands generated // beforehand. #[derive(Clone, Debug, PartialEq, Eq, Hash)] #[cfg_attr(feature = "servo", derive(HeapSizeOf))] pub enum TransitionProperty { - /// All, any animatable property changing should generate a transition. + /// All, any transitionable property changing should generate a transition. All, - % for prop in data.longhands: - % if prop.animatable: + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: /// ${prop.name} ${prop.camel_case}, % endif % endfor - // Shorthand properties may or may not contain any animatable property. Either should still be - // parsed properly. - % for prop in data.shorthands_except_all(): - /// ${prop.name} - ${prop.camel_case}, - % endfor - /// Unrecognized property which could be any non-animatable, custom property, or + /// Unrecognized property which could be any non-transitionable, custom property, or /// unknown property. Unsupported(Atom) } @@ -80,17 +204,17 @@ impl TransitionProperty { /// Iterates over each longhand property. pub fn each<F: FnMut(&TransitionProperty) -> ()>(mut cb: F) { % for prop in data.longhands: - % if prop.animatable: + % if prop.transitionable: cb(&TransitionProperty::${prop.camel_case}); % endif % endfor } - /// Iterates over every property that is not TransitionProperty::All, stopping and returning - /// true when the provided callback returns true for the first time. + /// Iterates over every longhand property that is not TransitionProperty::All, stopping and + /// returning true when the provided callback returns true for the first time. pub fn any<F: FnMut(&TransitionProperty) -> bool>(mut cb: F) -> bool { % for prop in data.longhands: - % if prop.animatable: + % if prop.transitionable: if cb(&TransitionProperty::${prop.camel_case}) { return true; } @@ -104,14 +228,11 @@ impl TransitionProperty { let ident = try!(input.expect_ident()); (match_ignore_ascii_case! { &ident, "all" => Ok(TransitionProperty::All), - % for prop in data.longhands: - % if prop.animatable: + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: "${prop.name}" => Ok(TransitionProperty::${prop.camel_case}), % endif % endfor - % for prop in data.shorthands_except_all(): - "${prop.name}" => Ok(TransitionProperty::${prop.camel_case}), - % endfor "none" => Err(()), _ => { match CSSWideKeyword::from_ident(&ident) { @@ -122,59 +243,24 @@ impl TransitionProperty { }).map_err(|()| SelectorParseError::UnexpectedIdent(ident.into()).into()) } - /// Get a transition property from a property declaration. - pub fn from_declaration(declaration: &PropertyDeclaration) -> Option<Self> { - use properties::LonghandId; - match *declaration { - % for prop in data.longhands: - % if prop.animatable: - PropertyDeclaration::${prop.camel_case}(..) - => Some(TransitionProperty::${prop.camel_case}), - % endif - % endfor - PropertyDeclaration::CSSWideKeyword(id, _) | - PropertyDeclaration::WithVariables(id, _) => { - match id { - % for prop in data.longhands: - % if prop.animatable: - LonghandId::${prop.camel_case} => - Some(TransitionProperty::${prop.camel_case}), - % endif - % endfor - _ => None, - } - }, - _ => None, - } - } - - /// Returns true if this TransitionProperty is one of the discrete animatable properties and - /// this TransitionProperty should be a longhand property. - pub fn is_discrete(&self) -> bool { - match *self { - % for prop in data.longhands: - % if prop.animation_value_type == "discrete": - TransitionProperty::${prop.camel_case} => true, - % endif - % endfor - _ => false - } - } - - /// Return animatable longhands of this shorthand TransitionProperty, except for "all". + /// Return transitionable longhands of this shorthand TransitionProperty, except for "all". pub fn longhands(&self) -> &'static [TransitionProperty] { % for prop in data.shorthands_except_all(): - static ${prop.ident.upper()}: &'static [TransitionProperty] = &[ - % for sub in prop.sub_properties: - % if sub.animatable: - TransitionProperty::${sub.camel_case}, - % endif - % endfor - ]; + % if prop.transitionable: + static ${prop.ident.upper()}: &'static [TransitionProperty] = &[ + % for sub in prop.sub_properties: + % if sub.transitionable: + TransitionProperty::${sub.camel_case}, + % endif + % endfor + ]; + % endif % endfor match *self { % for prop in data.shorthands_except_all(): - TransitionProperty::${prop.camel_case} => ${prop.ident.upper()}, + % if prop.transitionable: + TransitionProperty::${prop.camel_case} => ${prop.ident.upper()}, + % endif % endfor _ => panic!("Not allowed to call longhands() for this TransitionProperty") } @@ -184,50 +270,26 @@ impl TransitionProperty { pub fn is_shorthand(&self) -> bool { match *self { % for prop in data.shorthands_except_all(): - TransitionProperty::${prop.camel_case} => true, + % if prop.transitionable: + TransitionProperty::${prop.camel_case} => true, + % endif % endfor _ => false } } } -/// Returns true if this nsCSSPropertyID is one of the animatable properties. -#[cfg(feature = "gecko")] -pub fn nscsspropertyid_is_animatable(property: nsCSSPropertyID) -> bool { - match property { - % for prop in data.longhands: - % if prop.animatable: - ${helpers.to_nscsspropertyid(prop.ident)} => true, - % endif - % endfor - % for prop in data.shorthands_except_all(): - <% - animatable = "false" - for sub in prop.sub_properties: - if sub.animatable: - animatable = "true" - break - %> - ${helpers.to_nscsspropertyid(prop.ident)} => ${animatable}, - % endfor - _ => false - } -} - impl ToCss for TransitionProperty { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write, { match *self { TransitionProperty::All => dest.write_str("all"), - % for prop in data.longhands: - % if prop.animatable: + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: TransitionProperty::${prop.camel_case} => dest.write_str("${prop.name}"), % endif % endfor - % for prop in data.shorthands_except_all(): - TransitionProperty::${prop.camel_case} => dest.write_str("${prop.name}"), - % endfor #[cfg(feature = "gecko")] TransitionProperty::Unsupported(ref atom) => serialize_identifier(&atom.to_string(), dest), @@ -243,16 +305,12 @@ impl ToCss for TransitionProperty { impl<'a> From< &'a TransitionProperty> for nsCSSPropertyID { fn from(transition_property: &'a TransitionProperty) -> nsCSSPropertyID { match *transition_property { - % for prop in data.longhands: - % if prop.animatable: + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: TransitionProperty::${prop.camel_case} => ${helpers.to_nscsspropertyid(prop.ident)}, % endif % endfor - % for prop in data.shorthands_except_all(): - TransitionProperty::${prop.camel_case} - => ${helpers.to_nscsspropertyid(prop.ident)}, - % endfor TransitionProperty::All => nsCSSPropertyID::eCSSPropertyExtra_all_properties, _ => panic!("Unconvertable Servo transition property: {:?}", transition_property), } @@ -265,8 +323,8 @@ impl<'a> From< &'a TransitionProperty> for nsCSSPropertyID { impl From<nsCSSPropertyID> for TransitionProperty { fn from(property: nsCSSPropertyID) -> TransitionProperty { match property { - % for prop in data.longhands: - % if prop.animatable: + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: ${helpers.to_nscsspropertyid(prop.ident)} => TransitionProperty::${prop.camel_case}, % else: @@ -274,30 +332,22 @@ impl From<nsCSSPropertyID> for TransitionProperty { => TransitionProperty::Unsupported(Atom::from("${prop.ident}")), % endif % endfor - % for prop in data.shorthands_except_all(): - ${helpers.to_nscsspropertyid(prop.ident)} - => TransitionProperty::${prop.camel_case}, - % endfor nsCSSPropertyID::eCSSPropertyExtra_all_properties => TransitionProperty::All, _ => panic!("Unconvertable nsCSSPropertyID: {:?}", property), } } } -/// Convert to PropertyDeclarationId. +/// Returns true if this nsCSSPropertyID is one of the transitionable properties. #[cfg(feature = "gecko")] -#[allow(non_upper_case_globals)] -impl<'a> From<TransitionProperty> for PropertyDeclarationId<'a> { - fn from(transition_property: TransitionProperty) -> PropertyDeclarationId<'a> { - match transition_property { - % for prop in data.longhands: - % if prop.animatable: - TransitionProperty::${prop.camel_case} - => PropertyDeclarationId::Longhand(LonghandId::${prop.camel_case}), - % endif - % endfor - _ => panic!(), - } +pub fn nscsspropertyid_is_transitionable(property: nsCSSPropertyID) -> bool { + match property { + % for prop in data.longhands + data.shorthands_except_all(): + % if prop.transitionable: + ${helpers.to_nscsspropertyid(prop.ident)} => true, + % endif + % endfor + _ => false } } @@ -387,22 +437,20 @@ impl AnimatedProperty { /// Get an animatable value from a transition-property, an old style, and a /// new style. - pub fn from_transition_property(transition_property: &TransitionProperty, + pub fn from_animatable_longhand(property: &AnimatableLonghand, old_style: &ComputedValues, new_style: &ComputedValues) -> AnimatedProperty { - match *transition_property { - TransitionProperty::All => panic!("Can't use TransitionProperty::All here."), + match *property { % for prop in data.longhands: % if prop.animatable: - TransitionProperty::${prop.camel_case} => { + AnimatableLonghand::${prop.camel_case} => { AnimatedProperty::${prop.camel_case}( old_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}().into(), new_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}().into()) } % endif % endfor - ref other => panic!("Can't use TransitionProperty::{:?} here", other), } } } @@ -411,7 +459,7 @@ impl AnimatedProperty { /// This HashMap stores the values that are the last AnimationValue to be /// composed for each TransitionProperty. #[cfg(feature = "gecko")] -pub type AnimationValueMap = HashMap<TransitionProperty, AnimationValue>; +pub type AnimationValueMap = HashMap<AnimatableLonghand, AnimationValue>; #[cfg(feature = "gecko")] unsafe impl HasFFI for AnimationValueMap { type FFIType = RawServoAnimationValueMap; @@ -579,15 +627,14 @@ impl AnimationValue { } } - /// Get an AnimationValue for a TransitionProperty from a given computed values. - pub fn from_computed_values(transition_property: &TransitionProperty, + /// Get an AnimationValue for an AnimatableLonghand from a given computed values. + pub fn from_computed_values(property: &AnimatableLonghand, computed_values: &ComputedValues) -> Self { - match *transition_property { - TransitionProperty::All => panic!("Can't use TransitionProperty::All here."), + match *property { % for prop in data.longhands: % if prop.animatable: - TransitionProperty::${prop.camel_case} => { + AnimatableLonghand::${prop.camel_case} => { AnimationValue::${prop.camel_case}( % if prop.is_animatable_with_computed_value: computed_values.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}()) @@ -598,7 +645,6 @@ impl AnimationValue { } % endif % endfor - ref other => panic!("Can't use TransitionProperty::{:?} here.", other), } } } diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index b3ada208939..551b10f96ae 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -12,7 +12,7 @@ // TODO(SimonSapin): don't parse `inline-table`, since we don't support it <%helpers:longhand name="display" need_clone="True" - animation_value_type="none" + animation_value_type="discrete" custom_cascade="${product == 'servo'}" spec="https://drafts.csswg.org/css-display/#propdef-display"> <% diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index d307a3833c5..72af0a2d6d7 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -32,7 +32,7 @@ use font_metrics::FontMetricsProvider; use logical_geometry::WritingMode; use media_queries::Device; use parser::{Parse, ParserContext}; -use properties::animated_properties::TransitionProperty; +use properties::animated_properties::AnimatableLonghand; #[cfg(feature = "gecko")] use properties::longhands::system_font::SystemFont; use selectors::parser::SelectorParseError; #[cfg(feature = "servo")] use servo_config::prefs::PREFS; @@ -300,29 +300,25 @@ impl LonghandIdSet { } } - /// Set the corresponding bit of TransitionProperty. - /// This function will panic if TransitionProperty::All is given. - pub fn set_transition_property_bit(&mut self, property: &TransitionProperty) { + /// Set the corresponding bit of AnimatableLonghand. + pub fn set_animatable_longhand_bit(&mut self, property: &AnimatableLonghand) { match *property { % for prop in data.longhands: % if prop.animatable: - TransitionProperty::${prop.camel_case} => self.insert(LonghandId::${prop.camel_case}), + AnimatableLonghand::${prop.camel_case} => self.insert(LonghandId::${prop.camel_case}), % endif % endfor - ref other => unreachable!("Tried to set TransitionProperty::{:?} in a PropertyBitfield", other), } } - /// Return true if the corresponding bit of TransitionProperty is set. - /// This function will panic if TransitionProperty::All is given. - pub fn has_transition_property_bit(&self, property: &TransitionProperty) -> bool { + /// Return true if the corresponding bit of AnimatableLonghand is set. + pub fn has_animatable_longhand_bit(&self, property: &AnimatableLonghand) -> bool { match *property { % for prop in data.longhands: % if prop.animatable: - TransitionProperty::${prop.camel_case} => self.contains(LonghandId::${prop.camel_case}), + AnimatableLonghand::${prop.camel_case} => self.contains(LonghandId::${prop.camel_case}), % endif % endfor - ref other => unreachable!("Tried to get TransitionProperty::{:?} in a PropertyBitfield", other), } } } |