Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Kill delegate_animate from vector_longhand

Browse source 
The impl is now always generated if animation_value_type is ComputedValue.
This commit is contained in:
Anthony Ramine 2017-07-04 15:26:17 +02:00
parent 6c7c00f4c8
commit 4a2ede9b3a
6 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/properties/helpers.mako.rs
View file

@ -76,9 +76,8 @@
We assume that the default/initial value is an empty vector for these.
`initial_value` need not be defined for these.
</%doc>
<%def name="vector_longhand(name, allow_empty=False,
delegate_animate=False, separator='Comma', **kwargs)">
<%call expr="longhand(name, vector=True, **kwargs)">
<%def name="vector_longhand(name, animation_value_type=None, allow_empty=False, separator='Comma', **kwargs)">
<%call expr="longhand(name, animation_value_type=animation_value_type, vector=True, **kwargs)">
#[allow(unused_imports)]
use smallvec::SmallVec;
use std::fmt;
@ -128,7 +127,7 @@
% endif
);
% if delegate_animate:
% if animation_value_type == "ComputedValue":
use properties::animated_properties::Animatable;
impl Animatable for T {
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64)

18
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -16,7 +16,6 @@ use euclid::{Point2D, Size2D};
#[cfg(feature = "gecko")] use gecko_string_cache::Atom;
use properties::{CSSWideKeyword, PropertyDeclaration};
use properties::longhands;
use properties::longhands::background_size::computed_value::T as BackgroundSizeList;
use properties::longhands::font_weight::computed_value::T as FontWeight;
use properties::longhands::font_stretch::computed_value::T as FontStretch;
use properties::longhands::transform::computed_value::ComputedMatrix;
@ -1083,23 +1082,6 @@ impl Animatable for VerticalAlign {
}
}
impl Animatable for BackgroundSizeList {
#[inline]
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
self.0.add_weighted(&other.0, self_portion, other_portion).map(BackgroundSizeList)
}
#[inline]
fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
self.0.compute_distance(&other.0)
}
#[inline]
fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
self.0.compute_squared_distance(&other.0)
}
}
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
impl Animatable for CalcLengthOrPercentage {
#[inline]

14
components/style/properties/longhand/background.mako.rs
View file

@ -24,11 +24,15 @@ ${helpers.predefined_type("background-image", "ImageLayer",
ignored_when_colors_disabled="True")}
% for (axis, direction, initial) in [("x", "Horizontal", "left"), ("y", "Vertical", "top")]:
${helpers.predefined_type("background-position-" + axis, "position::" + direction + "Position",
initial_value="computed::LengthOrPercentage::zero()",
initial_specified_value="SpecifiedValue::initial_specified_value()",
spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-" + axis,
animation_value_type="ComputedValue", vector=True, delegate_animate=True)}
${helpers.predefined_type(
"background-position-" + axis,
"position::" + direction + "Position",
initial_value="computed::LengthOrPercentage::zero()",
initial_specified_value="SpecifiedValue::initial_specified_value()",
spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-" + axis,
animation_value_type="ComputedValue",
vector=True,
)}
% endfor
<%helpers:vector_longhand name="background-repeat" animation_value_type="discrete"

3
components/style/properties/longhand/box.mako.rs
View file

@ -679,8 +679,7 @@ ${helpers.predefined_type(
products="gecko",
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)",
animation_value_type="ComputedValue",
allow_empty="NotInitial",
delegate_animate=True,
allow_empty="NotInitial"
)}
<%helpers:longhand name="transform" extra_prefixes="webkit"

1
components/style/properties/longhand/inherited_svg.mako.rs
View file

@ -94,7 +94,6 @@ ${helpers.predefined_type(
None,
"parse_non_negative",
vector=True,
delegate_animate=True,
products="gecko",
animation_value_type="ComputedValue",
separator="CommaWithSpace",

17
components/style/properties/longhand/svg.mako.rs
View file

@ -89,12 +89,17 @@ ${helpers.single_keyword("mask-mode",
</%helpers:vector_longhand>
% for (axis, direction) in [("x", "Horizontal"), ("y", "Vertical")]:
${helpers.predefined_type("mask-position-" + axis, "position::" + direction + "Position",
products="gecko", extra_prefixes="webkit",
initial_value="computed::LengthOrPercentage::zero()",
initial_specified_value="specified::PositionComponent::Center",
spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position",
animation_value_type="ComputedValue", vector=True, delegate_animate=True)}
${helpers.predefined_type(
"mask-position-" + axis,
"position::" + direction + "Position",
products="gecko",
extra_prefixes="webkit",
initial_value="computed::LengthOrPercentage::zero()",
initial_specified_value="specified::PositionComponent::Center",
spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position",
animation_value_type="ComputedValue",
vector=True,
)}
% endfor
${helpers.single_keyword("mask-clip",