Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #19620 - style: Make sure to honor parse_method in transition and animation shorthands (from emilio:parse-transition-longhand); r=bbirtles

Browse Source 
Reviewed-by: birtles
Bug: 1426312
MozReview-Commit-ID: HY3jtdSdaga
Source-Repo: https://github.com/servo/servo
Source-Revision: e983a5e982df6f5c4725d5f35a31efb7769be43d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d7e25fd32405e43067a8ef09e21eb63d6b34fd0c
This commit is contained in:
Emilio Cobos Álvarez 2017-12-21 07:01:59 -06:00
parent fa4273ed80
commit c15479b46f
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servo/components/style/properties/shorthand/box.mako.rs
View File

@ -97,18 +97,10 @@
</%helpers:shorthand>
macro_rules! try_parse_one {
($input: expr, $var: ident, $prop_module: ident) => {
if $var.is_none() {
if let Ok(value) = $input.try($prop_module::SingleSpecifiedValue::parse) {
$var = Some(value);
continue;
}
}
};
($context: expr, $input: expr, $var: ident, $prop_module: ident) => {
if $var.is_none() {
if let Ok(value) = $input.try(|i| {
$prop_module::SingleSpecifiedValue::parse($context, i)
$prop_module::single_value::parse($context, i)
}) {
$var = Some(value);
continue;
@ -122,7 +114,6 @@ macro_rules! try_parse_one {
transition-timing-function
transition-delay"
spec="https://drafts.csswg.org/css-transitions/#propdef-transition">
use parser::Parse;
% for prop in "delay duration property timing_function".split():
use properties::longhands::transition_${prop};
% endfor
@ -265,7 +256,6 @@ macro_rules! try_parse_one {
props = "name duration timing_function delay iteration_count \
direction fill_mode play_state".split()
%>
use parser::Parse;
% for prop in props:
use properties::longhands::animation_${prop};
% endfor
@ -296,9 +286,9 @@ macro_rules! try_parse_one {
try_parse_one!(context, input, timing_function, animation_timing_function);
try_parse_one!(context, input, delay, animation_delay);
try_parse_one!(context, input, iteration_count, animation_iteration_count);
try_parse_one!(input, direction, animation_direction);
try_parse_one!(input, fill_mode, animation_fill_mode);
try_parse_one!(input, play_state, animation_play_state);
try_parse_one!(context, input, direction, animation_direction);
try_parse_one!(context, input, fill_mode, animation_fill_mode);
try_parse_one!(context, input, play_state, animation_play_state);
try_parse_one!(context, input, name, animation_name);
parsed -= 1;