Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Make @font-face and @counter-style serialization closer other browsers and style rules.

Browse source 
Style rules serialize on one line and so should @font-face blocks.

Part of https://github.com/w3c/csswg-drafts/issues/4828.

Differential Revision: https://phabricator.services.mozilla.com/D89302
This commit is contained in:
Emilio Cobos Álvarez 2020-09-05 00:42:43 +00:00
parent 74c449c04c
commit cd7619dbf6
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/counter_style/mod.rs
View file

@ -232,12 +232,12 @@ macro_rules! counter_style_descriptors {
fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result { fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result {
dest.write_str("@counter-style ")?; dest.write_str("@counter-style ")?;
self.name.to_css(&mut CssWriter::new(dest))?; self.name.to_css(&mut CssWriter::new(dest))?;
dest.write_str(" {\n")?; dest.write_str(" { ")?;
$( $(
if let Some(ref value) = self.$ident { if let Some(ref value) = self.$ident {
dest.write_str(concat!(" ", $name, ": "))?; dest.write_str(concat!($name, ": "))?;
ToCss::to_css(value, &mut CssWriter::new(dest))?; ToCss::to_css(value, &mut CssWriter::new(dest))?;
dest.write_str(";\n")?; dest.write_str("; ")?;
} }
)+ )+
dest.write_str("}") dest.write_str("}")

13
components/style/font_face.rs
View file

@ -456,9 +456,9 @@ macro_rules! font_face_descriptors_common {
pub fn decl_to_css(&self, dest: &mut CssStringWriter) -> fmt::Result { pub fn decl_to_css(&self, dest: &mut CssStringWriter) -> fmt::Result {
$( $(
if let Some(ref value) = self.$ident { if let Some(ref value) = self.$ident {
dest.write_str(concat!(" ", $name, ": "))?; dest.write_str(concat!($name, ": "))?;
ToCss::to_css(value, &mut CssWriter::new(dest))?; ToCss::to_css(value, &mut CssWriter::new(dest))?;
dest.write_str(";\n")?; dest.write_str("; ")?;
} }
)* )*
Ok(()) Ok(())
@ -469,8 +469,11 @@ macro_rules! font_face_descriptors_common {
type Declaration = (); type Declaration = ();
type Error = StyleParseErrorKind<'i>; type Error = StyleParseErrorKind<'i>;
fn parse_value<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>) fn parse_value<'t>(
-> Result<(), ParseError<'i>> { &mut self,
name: CowRcStr<'i>,
input: &mut Parser<'i, 't>,
) -> Result<(), ParseError<'i>> {
match_ignore_ascii_case! { &*name, match_ignore_ascii_case! { &*name,
$( $(
$name if is_descriptor_enabled!($name) => { $name if is_descriptor_enabled!($name) => {
@ -493,7 +496,7 @@ macro_rules! font_face_descriptors_common {
impl ToCssWithGuard for FontFaceRuleData { impl ToCssWithGuard for FontFaceRuleData {
// Serialization of FontFaceRule is not specced. // Serialization of FontFaceRule is not specced.
fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result { fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result {
dest.write_str("@font-face {\n")?; dest.write_str("@font-face { ")?;
self.decl_to_css(dest)?; self.decl_to_css(dest)?;
dest.write_str("}") dest.write_str("}")
} }