mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #14017 - iamrohit7:scroll-snap-points, r=Manishearth
Parsing/Serialization for scroll-snap-points-* <!-- Please describe your changes on the following line: --> Implements Parsing/Serialization for scroll-snap-points-x and scroll-snap-points-y --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13871 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/14017) <!-- Reviewable:end -->
This commit is contained in:
commit
193a4d88ed
2 changed files with 123 additions and 1 deletions
|
@ -850,7 +850,8 @@ fn static_assert() {
|
|||
</%self:impl_trait>
|
||||
|
||||
<% skip_box_longhands= """display overflow-y vertical-align
|
||||
-moz-binding page-break-before page-break-after""" %>
|
||||
-moz-binding page-break-before page-break-after
|
||||
scroll-snap-points-x scroll-snap-points-y""" %>
|
||||
<%self:impl_trait style_struct_name="Box" skip_longhands="${skip_box_longhands}">
|
||||
|
||||
// We manually-implement the |display| property until we get general
|
||||
|
@ -976,6 +977,24 @@ fn static_assert() {
|
|||
|
||||
${impl_simple_copy('page_break_after', 'mBreakAfter')}
|
||||
|
||||
pub fn set_scroll_snap_points_x(&mut self, v: longhands::scroll_snap_points_x::computed_value::T) {
|
||||
match v.0 {
|
||||
None => self.gecko.mScrollSnapPointsX.set_value(CoordDataValue::None),
|
||||
Some(l) => l.to_gecko_style_coord(&mut self.gecko.mScrollSnapPointsX),
|
||||
};
|
||||
}
|
||||
|
||||
${impl_coord_copy('scroll_snap_points_x', 'mScrollSnapPointsX')}
|
||||
|
||||
pub fn set_scroll_snap_points_y(&mut self, v: longhands::scroll_snap_points_y::computed_value::T) {
|
||||
match v.0 {
|
||||
None => self.gecko.mScrollSnapPointsY.set_value(CoordDataValue::None),
|
||||
Some(l) => l.to_gecko_style_coord(&mut self.gecko.mScrollSnapPointsY),
|
||||
};
|
||||
}
|
||||
|
||||
${impl_coord_copy('scroll_snap_points_y', 'mScrollSnapPointsY')}
|
||||
|
||||
</%self:impl_trait>
|
||||
|
||||
<%def name="simple_image_array_property(name, shorthand, field_name)">
|
||||
|
|
|
@ -841,6 +841,109 @@ ${helpers.keyword_list("animation-fill-mode",
|
|||
pub use super::transition_duration::SingleSpecifiedValue;
|
||||
</%helpers:longhand>
|
||||
|
||||
<%helpers:longhand products="gecko" name="scroll-snap-points-y" animatable="False">
|
||||
use cssparser::ToCss;
|
||||
use std::fmt;
|
||||
use values::LocalToCss;
|
||||
use values::HasViewportPercentage;
|
||||
use values::specified::LengthOrPercentage;
|
||||
|
||||
impl HasViewportPercentage for SpecifiedValue {
|
||||
fn has_viewport_percentage(&self) -> bool {
|
||||
match *self {
|
||||
SpecifiedValue::Repeat(length) => length.has_viewport_percentage(),
|
||||
_ => false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub mod computed_value {
|
||||
use values::computed::LengthOrPercentage;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub struct T(pub Option<LengthOrPercentage>);
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub enum SpecifiedValue {
|
||||
None,
|
||||
Repeat(LengthOrPercentage),
|
||||
}
|
||||
|
||||
impl ToCss for computed_value::T {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match self.0 {
|
||||
None => dest.write_str("none"),
|
||||
Some(l) => {
|
||||
try!(dest.write_str("repeat("));
|
||||
try!(l.to_css(dest));
|
||||
dest.write_str(")")
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
impl ToCss for SpecifiedValue {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self {
|
||||
SpecifiedValue::None => dest.write_str("none"),
|
||||
SpecifiedValue::Repeat(ref l) => {
|
||||
try!(dest.write_str("repeat("));
|
||||
try!(l.to_css(dest));
|
||||
dest.write_str(")")
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn get_initial_value() -> computed_value::T {
|
||||
computed_value::T(None)
|
||||
}
|
||||
|
||||
impl ToComputedValue for SpecifiedValue {
|
||||
type ComputedValue = computed_value::T;
|
||||
|
||||
#[inline]
|
||||
fn to_computed_value(&self, context: &Context) -> computed_value::T {
|
||||
match *self {
|
||||
SpecifiedValue::None => computed_value::T(None),
|
||||
SpecifiedValue::Repeat(l) =>
|
||||
computed_value::T(Some(l.to_computed_value(context))),
|
||||
}
|
||||
}
|
||||
#[inline]
|
||||
fn from_computed_value(computed: &computed_value::T) -> Self {
|
||||
match *computed {
|
||||
computed_value::T(None) => SpecifiedValue::None,
|
||||
computed_value::T(Some(l)) =>
|
||||
SpecifiedValue::Repeat(ToComputedValue::from_computed_value(&l))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
|
||||
if input.try(|input| input.expect_ident_matching("none")).is_ok() {
|
||||
Ok(SpecifiedValue::None)
|
||||
} else if input.try(|input| input.expect_function_matching("repeat")).is_ok() {
|
||||
input.parse_nested_block(|input| {
|
||||
LengthOrPercentage::parse_non_negative(input).map(SpecifiedValue::Repeat)
|
||||
})
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
</%helpers:longhand>
|
||||
|
||||
<%helpers:longhand products="gecko" name="scroll-snap-points-x" animatable="False">
|
||||
pub use super::scroll_snap_points_y::SpecifiedValue;
|
||||
pub use super::scroll_snap_points_y::computed_value;
|
||||
pub use super::scroll_snap_points_y::get_initial_value;
|
||||
pub use super::scroll_snap_points_y::parse;
|
||||
</%helpers:longhand>
|
||||
|
||||
|
||||
// CSSOM View Module
|
||||
// https://www.w3.org/TR/cssom-view-1/
|
||||
${helpers.single_keyword("scroll-behavior",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue