mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

servo: Merge #17469 - Distinguish the emptiness of a property from its initial value (from nox:empty-vs-initial); r=emilio 

Source-Repo: https://github.com/servo/servo
Source-Revision: 92679480b1dc70007d4de0391327d0cf34015e63

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 589c351520fb880c829a8b5ea68d9475b7682680
This commit is contained in:
Anthony Ramine 2017-06-23 05:59:49 -07:00
Родитель 702c22828d
Коммит 1c6a2b47b2
4 изменённых файлов: 46 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
servo/components/style/properties/helpers.mako.rs
Просмотреть файл

@ -9,7 +9,7 @@
<%def name="predefined_type(name, type, initial_value, parse_method='parse', <%def name="predefined_type(name, type, initial_value, parse_method='parse',
needs_context=True, vector=False, computed_type=None, initial_specified_value=None, needs_context=True, vector=False, computed_type=None, initial_specified_value=None,
allow_quirks=False, **kwargs)"> allow_quirks=False, allow_empty=False, **kwargs)">
<%def name="predefined_type_inner(name, type, initial_value, parse_method)"> <%def name="predefined_type_inner(name, type, initial_value, parse_method)">
#[allow(unused_imports)] #[allow(unused_imports)]
use app_units::Au; use app_units::Au;
@ -27,7 +27,9 @@
pub use values::computed::${type} as T; pub use values::computed::${type} as T;
% endif % endif
} }
% if initial_value:
#[inline] pub fn get_initial_value() -> computed_value::T { ${initial_value} } #[inline] pub fn get_initial_value() -> computed_value::T { ${initial_value} }
% endif
% if initial_specified_value: % if initial_specified_value:
#[inline] pub fn get_initial_specified_value() -> SpecifiedValue { ${initial_specified_value} } #[inline] pub fn get_initial_specified_value() -> SpecifiedValue { ${initial_specified_value} }
% endif % endif
@ -46,7 +48,9 @@
} }
</%def> </%def>
% if vector: % if vector:
<%call expr="vector_longhand(name, predefined_type=type, **kwargs)"> <%call
expr="vector_longhand(name, predefined_type=type, allow_empty=allow_empty or not initial_value, **kwargs)"
>
${predefined_type_inner(name, type, initial_value, parse_method)} ${predefined_type_inner(name, type, initial_value, parse_method)}
% if caller: % if caller:
${caller.body()} ${caller.body()}
@ -202,7 +206,7 @@
} }
pub fn get_initial_value() -> computed_value::T { pub fn get_initial_value() -> computed_value::T {
% if allow_empty: % if allow_empty and allow_empty != "NotInitial":
computed_value::T(SmallVec::new()) computed_value::T(SmallVec::new())
% else: % else:
let mut v = SmallVec::new(); let mut v = SmallVec::new();

45
servo/components/style/properties/longhand/box.mako.rs
Просмотреть файл

@ -429,17 +429,19 @@ ${helpers.predefined_type("transition-timing-function",
extra_prefixes="moz webkit", extra_prefixes="moz webkit",
spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function")} spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function")}
${helpers.predefined_type("transition-property", ${helpers.predefined_type(
"TransitionProperty", "transition-property",
"computed::TransitionProperty::All", "TransitionProperty",
initial_specified_value="specified::TransitionProperty::All", "computed::TransitionProperty::All",
vector=True, initial_specified_value="specified::TransitionProperty::All",
allow_empty=True, vector=True,
need_index=True, allow_empty="NotInitial",
needs_context=False, need_index=True,
animation_value_type="none", needs_context=False,
extra_prefixes="moz webkit", animation_value_type="none",
spec="https://drafts.csswg.org/css-transitions/#propdef-transition-property")} extra_prefixes="moz webkit",
spec="https://drafts.csswg.org/css-transitions/#propdef-transition-property",
)}
${helpers.predefined_type("transition-delay", ${helpers.predefined_type("transition-delay",
"Time", "Time",
@ -668,16 +670,17 @@ ${helpers.predefined_type("scroll-snap-destination",
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)",
animation_value_type="ComputedValue")} animation_value_type="ComputedValue")}
${helpers.predefined_type("scroll-snap-coordinate", ${helpers.predefined_type(
"Position", "scroll-snap-coordinate",
"computed::Position::zero()", "Position",
vector=True, "computed::Position::zero()",
products="gecko", vector=True,
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)", products="gecko",
animation_value_type="ComputedValue", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)",
allow_empty=True, animation_value_type="ComputedValue",
delegate_animate=True)} allow_empty="NotInitial",
delegate_animate=True,
)}
<%helpers:longhand name="transform" extra_prefixes="webkit" <%helpers:longhand name="transform" extra_prefixes="webkit"
animation_value_type="ComputedValue" animation_value_type="ComputedValue"

23
servo/components/style/properties/longhand/inherited_svg.mako.rs
Просмотреть файл

@ -88,17 +88,18 @@ ${helpers.predefined_type("stroke-opacity", "Opacity", "1.0",
products="gecko", animation_value_type="ComputedValue", products="gecko", animation_value_type="ComputedValue",
spec="https://www.w3.org/TR/SVG11/painting.html#StrokeOpacityProperty")} spec="https://www.w3.org/TR/SVG11/painting.html#StrokeOpacityProperty")}
${helpers.predefined_type("stroke-dasharray", ${helpers.predefined_type(
"LengthOrPercentageOrNumber", "stroke-dasharray",
"Either::First(0.0)", "LengthOrPercentageOrNumber",
"parse_non_negative", None,
vector="True", "parse_non_negative",
delegate_animate="True", vector=True,
allow_empty="True", delegate_animate=True,
products="gecko", products="gecko",
animation_value_type="ComputedValue", animation_value_type="ComputedValue",
space_separated_allowed="True", space_separated_allowed="True",
spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")} spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing",
)}
${helpers.predefined_type( ${helpers.predefined_type(
"stroke-dashoffset", "LengthOrPercentageOrNumber", "stroke-dashoffset", "LengthOrPercentageOrNumber",

4
servo/components/style/properties/properties.mako.rs
Просмотреть файл

@ -1765,7 +1765,9 @@ pub mod style_structs {
/// Returns whether there are any transitions specified. /// Returns whether there are any transitions specified.
#[cfg(feature = "servo")] #[cfg(feature = "servo")]
pub fn specifies_transitions(&self) -> bool { pub fn specifies_transitions(&self) -> bool {
self.transition_property_count() > 0 self.transition_duration_iter()
.take(self.transition_property_count())
.any(|t| t.seconds() > 0.)
} }
% endif % endif
} }