mirror of
https://github.com/servo/servo.git
synced 2025-06-22 16:18:59 +01:00
style: Remove nscsspropertyid_is_{animatable,transitionable}.
There are better ways, plus the existing code didn't handle aliases at all (not that it needed to, but it's better if it does). Differential Revision: https://phabricator.services.mozilla.com/D10838
This commit is contained in:
parent
707bd841a8
commit
8b49ef813f
3 changed files with 16 additions and 27 deletions
|
@ -432,6 +432,8 @@ class Alias(object):
|
||||||
self.original = original
|
self.original = original
|
||||||
self.enabled_in = original.enabled_in
|
self.enabled_in = original.enabled_in
|
||||||
self.servo_pref = original.servo_pref
|
self.servo_pref = original.servo_pref
|
||||||
|
self.animatable = original.animatable
|
||||||
|
self.transitionable = original.transitionable
|
||||||
self.gecko_pref = gecko_pref
|
self.gecko_pref = gecko_pref
|
||||||
self.allowed_in_page_rule = original.allowed_in_page_rule
|
self.allowed_in_page_rule = original.allowed_in_page_rule
|
||||||
self.allowed_in_keyframe_block = original.allowed_in_keyframe_block
|
self.allowed_in_keyframe_block = original.allowed_in_keyframe_block
|
||||||
|
|
|
@ -50,20 +50,6 @@ use values::generics::svg::{SVGLength, SvgLengthOrPercentageOrNumber, SVGPaint}
|
||||||
use values::generics::svg::{SVGPaintKind, SVGStrokeDashArray, SVGOpacity};
|
use values::generics::svg::{SVGPaintKind, SVGStrokeDashArray, SVGOpacity};
|
||||||
use void::{self, Void};
|
use void::{self, Void};
|
||||||
|
|
||||||
|
|
||||||
/// 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:
|
|
||||||
${prop.nscsspropertyid()} => true,
|
|
||||||
% endif
|
|
||||||
% endfor
|
|
||||||
_ => false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Convert nsCSSPropertyID to TransitionProperty
|
/// Convert nsCSSPropertyID to TransitionProperty
|
||||||
#[cfg(feature = "gecko")]
|
#[cfg(feature = "gecko")]
|
||||||
#[allow(non_upper_case_globals)]
|
#[allow(non_upper_case_globals)]
|
||||||
|
@ -90,19 +76,6 @@ impl From<nsCSSPropertyID> for TransitionProperty {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns true if this nsCSSPropertyID is one of the transitionable properties.
|
|
||||||
#[cfg(feature = "gecko")]
|
|
||||||
pub fn nscsspropertyid_is_transitionable(property: nsCSSPropertyID) -> bool {
|
|
||||||
match property {
|
|
||||||
% for prop in data.longhands + data.shorthands_except_all():
|
|
||||||
% if prop.transitionable:
|
|
||||||
${prop.nscsspropertyid()} => true,
|
|
||||||
% endif
|
|
||||||
% endfor
|
|
||||||
_ => false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An animated property interpolation between two computed values for that
|
/// An animated property interpolation between two computed values for that
|
||||||
/// property.
|
/// property.
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
|
|
|
@ -471,6 +471,20 @@ impl NonCustomPropertyId {
|
||||||
MAP[self.0]
|
MAP[self.0]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns whether this property is transitionable.
|
||||||
|
#[inline]
|
||||||
|
pub fn is_transitionable(self) -> bool {
|
||||||
|
${static_non_custom_property_id_set("TRANSITIONABLE", lambda p: p.transitionable)}
|
||||||
|
TRANSITIONABLE.contains(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns whether this property is animatable.
|
||||||
|
#[inline]
|
||||||
|
pub fn is_animatable(self) -> bool {
|
||||||
|
${static_non_custom_property_id_set("ANIMATABLE", lambda p: p.animatable)}
|
||||||
|
ANIMATABLE.contains(self)
|
||||||
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn enabled_for_all_content(self) -> bool {
|
fn enabled_for_all_content(self) -> bool {
|
||||||
${static_non_custom_property_id_set(
|
${static_non_custom_property_id_set(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue