aboutsummaryrefslogtreecommitdiffstats
path: root/components/style
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-09-21 16:43:37 -0500
committerGitHub <noreply@github.com>2017-09-21 16:43:37 -0500
commit83705a8fa8992a974b32acc6635c7dfeed1afa50 (patch)
tree3c356f2b466e8ebcc6c7d63ca096481c6e2cfeaa /components/style
parent29517d553e6c2fddc7e3cf0c0abef58c6d0f34aa (diff)
parentc5c604b9c461b8d5d31e49ed76d3821700fd897b (diff)
downloadservo-83705a8fa8992a974b32acc6635c7dfeed1afa50.tar.gz
servo-83705a8fa8992a974b32acc6635c7dfeed1afa50.zip
Auto merge of #18593 - jryans:stylo-anim-inherit-context, r=heycam
Update inherited prop state for animation https://bugzilla.mozilla.org/show_bug.cgi?id=1401256 <!-- 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/18593) <!-- Reviewable:end -->
Diffstat (limited to 'components/style')
-rw-r--r--components/style/properties/helpers/animated_properties.mako.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs
index ee3f601cdb9..5f98b7e5c0a 100644
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@@ -576,6 +576,12 @@ impl AnimationValue {
% for prop in data.longhands:
% if prop.animatable:
PropertyDeclaration::${prop.camel_case}(ref val) => {
+ context.for_non_inherited_property =
+ % if prop.style_struct.inherited:
+ None;
+ % else:
+ Some(LonghandId::${prop.camel_case});
+ % endif
% if prop.ident in SYSTEM_FONT_LONGHANDS and product == "gecko":
if let Some(sf) = val.get_system() {
longhands::system_font::resolve_system_font(sf, context);