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

Unprefix column-rule properties in servo side

Browse source
This commit is contained in:
Xidorn Quan 2016-12-21 18:13:44 +11:00
parent bcf154d8e6
commit 2760e2bae6
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/gecko.mako.rs
View file

@ -2457,7 +2457,7 @@ clip-path
</%self:impl_trait> </%self:impl_trait>
<%self:impl_trait style_struct_name="Column" <%self:impl_trait style_struct_name="Column"
skip_longhands="column-count column-gap -moz-column-rule-width"> skip_longhands="column-count column-gap column-rule-width">
#[allow(unused_unsafe)] #[allow(unused_unsafe)]
pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) { pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) {
@ -2484,7 +2484,7 @@ clip-path
<%call expr="impl_coord_copy('column_gap', 'mColumnGap')"></%call> <%call expr="impl_coord_copy('column_gap', 'mColumnGap')"></%call>
<% impl_app_units("_moz_column_rule_width", "mColumnRuleWidth", need_clone=True, <% impl_app_units("column_rule_width", "mColumnRuleWidth", need_clone=True,
round_to_pixels=True) %> round_to_pixels=True) %>
</%self:impl_trait> </%self:impl_trait>

11
components/style/properties/longhand/column.mako.rs
View file

@ -107,7 +107,7 @@ ${helpers.single_keyword("column-fill", "auto balance",
products="gecko", animatable=False)} products="gecko", animatable=False)}
// https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width // https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width
<%helpers:longhand name="-moz-column-rule-width" products="gecko" animatable="True"> <%helpers:longhand name="column-rule-width" products="gecko" animatable="True">
use app_units::Au; use app_units::Au;
use std::fmt; use std::fmt;
use style_traits::ToCss; use style_traits::ToCss;
@ -137,19 +137,18 @@ ${helpers.single_keyword("column-fill", "auto balance",
</%helpers:longhand> </%helpers:longhand>
// https://drafts.csswg.org/css-multicol-1/#crc // https://drafts.csswg.org/css-multicol-1/#crc
${helpers.predefined_type("-moz-column-rule-color", "CSSColor", ${helpers.predefined_type("column-rule-color", "CSSColor",
"::cssparser::Color::CurrentColor", "::cssparser::Color::CurrentColor",
products="gecko", gecko_ffi_name="mColumnRuleColor", products="gecko", animatable=True,
animatable=True, complex_color=True, need_clone=True)} complex_color=True, need_clone=True)}
// It's not implemented in servo or gecko yet. // It's not implemented in servo or gecko yet.
// https://drafts.csswg.org/css-multicol-1/#column-span // https://drafts.csswg.org/css-multicol-1/#column-span
${helpers.single_keyword("column-span", "none all", ${helpers.single_keyword("column-span", "none all",
products="none", animatable=False)} products="none", animatable=False)}
${helpers.single_keyword("-moz-column-rule-style", ${helpers.single_keyword("column-rule-style",
"none hidden dotted dashed solid double groove ridge inset outset", "none hidden dotted dashed solid double groove ridge inset outset",
products="gecko", products="gecko",
gecko_ffi_name="mColumnRuleStyle",
gecko_constant_prefix="NS_STYLE_BORDER_STYLE", gecko_constant_prefix="NS_STYLE_BORDER_STYLE",
animatable=False)} animatable=False)}

24
components/style/properties/shorthand/column.mako.rs
View file

@ -59,10 +59,10 @@
</%helpers:shorthand> </%helpers:shorthand>
// https://drafts.csswg.org/css-multicol/#column-rule // https://drafts.csswg.org/css-multicol/#column-rule
<%helpers:shorthand name="-moz-column-rule" products="gecko" <%helpers:shorthand name="column-rule" products="gecko"
sub_properties="-moz-column-rule-width -moz-column-rule-style -moz-column-rule-color"> sub_properties="column-rule-width column-rule-style column-rule-color">
use properties::longhands::{_moz_column_rule_width, _moz_column_rule_style}; use properties::longhands::{column_rule_width, column_rule_style};
use properties::longhands::_moz_column_rule_color; use properties::longhands::column_rule_color;
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> { pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
% for name in "width style color".split(): % for name in "width style color".split():
@ -74,7 +74,7 @@
% for name in "width style color".split(): % for name in "width style color".split():
if column_rule_${name}.is_none() { if column_rule_${name}.is_none() {
if let Ok(value) = input.try(|input| if let Ok(value) = input.try(|input|
_moz_column_rule_${name}::parse(context, input)) { column_rule_${name}::parse(context, input)) {
column_rule_${name} = Some(value); column_rule_${name} = Some(value);
any = true; any = true;
continue continue
@ -87,10 +87,10 @@
if any { if any {
Ok(Longhands { Ok(Longhands {
% for name in "width style".split(): % for name in "width style".split():
_moz_column_rule_${name}: column_rule_${name} column_rule_${name}: column_rule_${name}
.or(Some(_moz_column_rule_${name}::get_initial_specified_value())), .or(Some(column_rule_${name}::get_initial_specified_value())),
% endfor % endfor
_moz_column_rule_color: column_rule_color, column_rule_color: column_rule_color,
}) })
} else { } else {
Err(()) Err(())
@ -100,14 +100,14 @@
impl<'a> LonghandsToSerialize<'a> { impl<'a> LonghandsToSerialize<'a> {
fn to_css_declared<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css_declared<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
let mut need_space = false; let mut need_space = false;
try!(self._moz_column_rule_width.to_css(dest)); try!(self.column_rule_width.to_css(dest));
if let DeclaredValue::Value(ref width) = *self._moz_column_rule_width { if let DeclaredValue::Value(ref width) = *self.column_rule_width {
try!(width.to_css(dest)); try!(width.to_css(dest));
need_space = true; need_space = true;
} }
if let DeclaredValue::Value(ref style) = *self._moz_column_rule_style { if let DeclaredValue::Value(ref style) = *self.column_rule_style {
if need_space { if need_space {
try!(write!(dest, " ")); try!(write!(dest, " "));
} }
@ -115,7 +115,7 @@
need_space = true; need_space = true;
} }
if let DeclaredValue::Value(ref color) = *self._moz_column_rule_color { if let DeclaredValue::Value(ref color) = *self.column_rule_color {
if need_space { if need_space {
try!(write!(dest, " ")); try!(write!(dest, " "));
} }