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

Rename entities that belong to text-emphasis-style value. Fix order of imports

Browse source
This commit is contained in:
Dmitry 2018-03-09 20:21:18 +03:00
parent acdb4df53b
commit a1dd888c23
5 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4709,22 +4709,22 @@ fn static_assert() {
pub fn set_text_emphasis_style(&mut self, v: values::computed::TextEmphasisStyle) { pub fn set_text_emphasis_style(&mut self, v: values::computed::TextEmphasisStyle) {
use values::computed::TextEmphasisStyle; use values::computed::TextEmphasisStyle;
use values::specified::text::{FillMode, ShapeKeyword}; use values::specified::text::{TextEmphasisFillMode, TextEmphasisShapeKeyword};
self.clear_text_emphasis_style_if_string(); self.clear_text_emphasis_style_if_string();
let (te, s) = match v { let (te, s) = match v {
TextEmphasisStyle::None => (structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE, ""), TextEmphasisStyle::None => (structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE, ""),
TextEmphasisStyle::Keyword(ref keyword) => { TextEmphasisStyle::Keyword(ref keyword) => {
let fill = match keyword.fill { let fill = match keyword.fill {
FillMode::Filled => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED, TextEmphasisFillMode::Filled => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED,
FillMode::Open => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN, TextEmphasisFillMode::Open => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN,
}; };
let shape = match keyword.shape { let shape = match keyword.shape {
ShapeKeyword::Dot => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOT, TextEmphasisShapeKeyword::Dot => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOT,
ShapeKeyword::Circle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE, TextEmphasisShapeKeyword::Circle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE,
ShapeKeyword::DoubleCircle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE, TextEmphasisShapeKeyword::DoubleCircle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE,
ShapeKeyword::Triangle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE, TextEmphasisShapeKeyword::Triangle => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE,
ShapeKeyword::Sesame => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME, TextEmphasisShapeKeyword::Sesame => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME,
}; };
(shape | fill, keyword.shape.char(keyword.fill)) (shape | fill, keyword.shape.char(keyword.fill))
@ -4752,8 +4752,8 @@ fn static_assert() {
pub fn clone_text_emphasis_style(&self) -> values::computed::TextEmphasisStyle { pub fn clone_text_emphasis_style(&self) -> values::computed::TextEmphasisStyle {
use values::computed::TextEmphasisStyle; use values::computed::TextEmphasisStyle;
use values::specified::text::{FillMode, ShapeKeyword}; use values::computed::text::TextEmphasisKeywordValue;
use values::computed::text::{KeywordValue}; use values::specified::text::{TextEmphasisFillMode, TextEmphasisShapeKeyword};
if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE as u8 { if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE as u8 {
return TextEmphasisStyle::None; return TextEmphasisStyle::None;
@ -4766,19 +4766,19 @@ fn static_assert() {
let fill = let fill =
self.gecko.mTextEmphasisStyle & structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN as u8 == 0; self.gecko.mTextEmphasisStyle & structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN as u8 == 0;
let fill = if fill { FillMode::Filled } else { FillMode::Open }; let fill = if fill { TextEmphasisFillMode::Filled } else { TextEmphasisFillMode::Open };
let shape = let shape =
match self.gecko.mTextEmphasisStyle as u32 & !structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN { match self.gecko.mTextEmphasisStyle as u32 & !structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN {
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOT => ShapeKeyword::Dot, structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOT => TextEmphasisShapeKeyword::Dot,
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE => ShapeKeyword::Circle, structs::NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE => TextEmphasisShapeKeyword::Circle,
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE => ShapeKeyword::DoubleCircle, structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE => TextEmphasisShapeKeyword::DoubleCircle,
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE => ShapeKeyword::Triangle, structs::NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE => TextEmphasisShapeKeyword::Triangle,
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME => ShapeKeyword::Sesame, structs::NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME => TextEmphasisShapeKeyword::Sesame,
_ => panic!("Unexpected value in style struct for text-emphasis-style property") _ => panic!("Unexpected value in style struct for text-emphasis-style property")
}; };
TextEmphasisStyle::Keyword(KeywordValue { fill, shape }) TextEmphasisStyle::Keyword(TextEmphasisKeywordValue { fill, shape })
} }
${impl_non_negative_length('_webkit_text_stroke_width', ${impl_non_negative_length('_webkit_text_stroke_width',

2
components/style/properties/shorthand/inherited_text.mako.rs
View file

@ -33,7 +33,7 @@
if color.is_some() || style.is_some() { if color.is_some() || style.is_some() {
Ok(expanded! { Ok(expanded! {
text_emphasis_color: unwrap_or_initial!(text_emphasis_color, color), text_emphasis_color: unwrap_or_initial!(text_emphasis_color, color),
text_emphasis_style: unwrap_or_initial!(text_emphasis_style, style), // TODO: what? text_emphasis_style: unwrap_or_initial!(text_emphasis_style, style),
}) })
} else { } else {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)) Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))

2
components/style/values/computed/mod.rs
View file

@ -75,7 +75,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::svg::MozContextProperties; pub use self::svg::MozContextProperties;
pub use self::table::XSpan; pub use self::table::XSpan;
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize}; pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
pub use self::text::{TextAlign, TextOverflow, WordSpacing, TextEmphasisStyle}; pub use self::text::{TextAlign, TextEmphasisStyle, TextOverflow, WordSpacing};
pub use self::time::Time; pub use self::time::Time;
pub use self::transform::{Rotate, Scale, TimingFunction, Transform, TransformOperation}; pub use self::transform::{Rotate, Scale, TimingFunction, Transform, TransformOperation};
pub use self::transform::{TransformOrigin, TransformStyle, Translate}; pub use self::transform::{TransformOrigin, TransformStyle, Translate};

12
components/style/values/computed/text.rs
View file

@ -15,7 +15,7 @@ use values::generics::text::InitialLetter as GenericInitialLetter;
use values::generics::text::LineHeight as GenericLineHeight; use values::generics::text::LineHeight as GenericLineHeight;
use values::generics::text::MozTabSize as GenericMozTabSize; use values::generics::text::MozTabSize as GenericMozTabSize;
use values::generics::text::Spacing; use values::generics::text::Spacing;
use values::specified::text::{TextOverflowSide, TextDecorationLine, FillMode, ShapeKeyword}; use values::specified::text::{TextDecorationLine, TextEmphasisFillMode, TextEmphasisShapeKeyword, TextOverflowSide};
pub use values::specified::TextAlignKeyword as TextAlign; pub use values::specified::TextAlignKeyword as TextAlign;
@ -156,18 +156,18 @@ pub type MozTabSize = GenericMozTabSize<NonNegativeNumber, NonNegativeLength>;
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)] #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub enum TextEmphasisStyle { pub enum TextEmphasisStyle {
/// Keyword value for the text-emphasis-style property (`filled` `open`) /// Keyword value for the text-emphasis-style property (`filled` `open`)
Keyword(KeywordValue), Keyword(TextEmphasisKeywordValue),
/// `none` /// `none`
None, None,
/// String (will be used only first character) for the text-emphasis-style property /// String (will be used only first grapheme cluster) for the text-emphasis-style property
String(String), String(String),
} }
/// Keyword value for the text-emphasis-style property /// Keyword value for the text-emphasis-style property
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)] #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub struct KeywordValue { pub struct TextEmphasisKeywordValue {
/// fill for the text-emphasis-style property /// fill for the text-emphasis-style property
pub fill: FillMode, pub fill: TextEmphasisFillMode,
/// shape for the text-emphasis-style property /// shape for the text-emphasis-style property
pub shape: ShapeKeyword, pub shape: TextEmphasisShapeKeyword,
} }

70
components/style/values/specified/text.rs
View file

@ -12,8 +12,8 @@ use std::fmt::{self, Write};
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
use unicode_segmentation::UnicodeSegmentation; use unicode_segmentation::UnicodeSegmentation;
use values::computed::{Context, ToComputedValue}; use values::computed::{Context, ToComputedValue};
use values::computed::text::KeywordValue as ComputedKeywordValue;
use values::computed::text::LineHeight as ComputedLineHeight; use values::computed::text::LineHeight as ComputedLineHeight;
use values::computed::text::TextEmphasisKeywordValue as ComputedTextEmphasisKeywordValue;
use values::computed::text::TextEmphasisStyle as ComputedTextEmphasisStyle; use values::computed::text::TextEmphasisStyle as ComputedTextEmphasisStyle;
use values::computed::text::TextOverflow as ComputedTextOverflow; use values::computed::text::TextOverflow as ComputedTextOverflow;
use values::generics::text::InitialLetter as GenericInitialLetter; use values::generics::text::InitialLetter as GenericInitialLetter;
@ -522,37 +522,37 @@ impl ToComputedValue for TextAlign {
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)] #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub enum TextEmphasisStyle { pub enum TextEmphasisStyle {
/// <fill> <shape> /// <fill> <shape>
Keyword(KeywordValue), Keyword(TextEmphasisKeywordValue),
/// `none` /// `none`
None, None,
/// String (will be used only first character) for the text-emphasis-style property /// String (will be used only first grapheme cluster) for the text-emphasis-style property
String(String), String(String),
} }
/// Keyword value for the text-emphasis-style property /// Keyword value for the text-emphasis-style property
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)] #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub enum KeywordValue { pub enum TextEmphasisKeywordValue {
/// <fill> /// <fill>
Fill(FillMode), Fill(TextEmphasisFillMode),
/// <shape> /// <shape>
Shape(ShapeKeyword), Shape(TextEmphasisShapeKeyword),
/// <fill> <shape> /// <fill> <shape>
FillAndShape(FillMode, ShapeKeyword), FillAndShape(TextEmphasisFillMode, TextEmphasisShapeKeyword),
} }
impl KeywordValue { impl TextEmphasisKeywordValue {
fn fill(&self) -> Option<FillMode> { fn fill(&self) -> Option<TextEmphasisFillMode> {
match *self { match *self {
KeywordValue::Fill(fill) | TextEmphasisKeywordValue::Fill(fill) |
KeywordValue::FillAndShape(fill, _) => Some(fill), TextEmphasisKeywordValue::FillAndShape(fill, _) => Some(fill),
_ => None, _ => None,
} }
} }
fn shape(&self) -> Option<ShapeKeyword> { fn shape(&self) -> Option<TextEmphasisShapeKeyword> {
match *self { match *self {
KeywordValue::Shape(shape) | TextEmphasisKeywordValue::Shape(shape) |
KeywordValue::FillAndShape(_, shape) => Some(shape), TextEmphasisKeywordValue::FillAndShape(_, shape) => Some(shape),
_ => None, _ => None,
} }
} }
@ -560,7 +560,7 @@ impl KeywordValue {
/// Fill mode for the text-emphasis-style property /// Fill mode for the text-emphasis-style property
#[derive(Clone, Copy, Debug, MallocSizeOf, Parse, PartialEq, ToCss)] #[derive(Clone, Copy, Debug, MallocSizeOf, Parse, PartialEq, ToCss)]
pub enum FillMode { pub enum TextEmphasisFillMode {
/// `filled` /// `filled`
Filled, Filled,
/// `open` /// `open`
@ -569,7 +569,7 @@ pub enum FillMode {
/// Shape keyword for the text-emphasis-style property /// Shape keyword for the text-emphasis-style property
#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)] #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)]
pub enum ShapeKeyword { pub enum TextEmphasisShapeKeyword {
/// `dot` /// `dot`
Dot, Dot,
/// `circle` /// `circle`
@ -582,16 +582,16 @@ pub enum ShapeKeyword {
Sesame, Sesame,
} }
impl ShapeKeyword { impl TextEmphasisShapeKeyword {
/// converts fill mode to a unicode char /// converts fill mode to a unicode char
pub fn char(&self, fill: FillMode) -> &str { pub fn char(&self, fill: TextEmphasisFillMode) -> &str {
let fill = fill == FillMode::Filled; let fill = fill == TextEmphasisFillMode::Filled;
match *self { match *self {
ShapeKeyword::Dot => if fill { "\u{2022}" } else { "\u{25e6}" }, TextEmphasisShapeKeyword::Dot => if fill { "\u{2022}" } else { "\u{25e6}" },
ShapeKeyword::Circle => if fill { "\u{25cf}" } else { "\u{25cb}" }, TextEmphasisShapeKeyword::Circle => if fill { "\u{25cf}" } else { "\u{25cb}" },
ShapeKeyword::DoubleCircle => if fill { "\u{25c9}" } else { "\u{25ce}" }, TextEmphasisShapeKeyword::DoubleCircle => if fill { "\u{25c9}" } else { "\u{25ce}" },
ShapeKeyword::Triangle => if fill { "\u{25b2}" } else { "\u{25b3}" }, TextEmphasisShapeKeyword::Triangle => if fill { "\u{25b2}" } else { "\u{25b3}" },
ShapeKeyword::Sesame => if fill { "\u{fe45}" } else { "\u{fe46}" }, TextEmphasisShapeKeyword::Sesame => if fill { "\u{fe45}" } else { "\u{fe46}" },
} }
} }
} }
@ -605,12 +605,12 @@ impl ToComputedValue for TextEmphasisStyle {
TextEmphasisStyle::Keyword(ref keyword) => { TextEmphasisStyle::Keyword(ref keyword) => {
let default_shape = if context.style().get_inheritedbox() let default_shape = if context.style().get_inheritedbox()
.clone_writing_mode() == SpecifiedWritingMode::HorizontalTb { .clone_writing_mode() == SpecifiedWritingMode::HorizontalTb {
ShapeKeyword::Circle TextEmphasisShapeKeyword::Circle
} else { } else {
ShapeKeyword::Sesame TextEmphasisShapeKeyword::Sesame
}; };
ComputedTextEmphasisStyle::Keyword(ComputedKeywordValue { ComputedTextEmphasisStyle::Keyword(ComputedTextEmphasisKeywordValue {
fill: keyword.fill().unwrap_or(FillMode::Filled), fill: keyword.fill().unwrap_or(TextEmphasisFillMode::Filled),
shape: keyword.shape().unwrap_or(default_shape), shape: keyword.shape().unwrap_or(default_shape),
}) })
}, },
@ -627,7 +627,7 @@ impl ToComputedValue for TextEmphasisStyle {
fn from_computed_value(computed: &Self::ComputedValue) -> Self { fn from_computed_value(computed: &Self::ComputedValue) -> Self {
match *computed { match *computed {
ComputedTextEmphasisStyle::Keyword(ref keyword) => ComputedTextEmphasisStyle::Keyword(ref keyword) =>
TextEmphasisStyle::Keyword(KeywordValue::FillAndShape(keyword.fill, keyword.shape)), TextEmphasisStyle::Keyword(TextEmphasisKeywordValue::FillAndShape(keyword.fill, keyword.shape)),
ComputedTextEmphasisStyle::None => TextEmphasisStyle::None, ComputedTextEmphasisStyle::None => TextEmphasisStyle::None,
ComputedTextEmphasisStyle::String(ref string) => TextEmphasisStyle::String(string.clone()) ComputedTextEmphasisStyle::String(ref string) => TextEmphasisStyle::String(string.clone())
} }
@ -649,17 +649,17 @@ impl Parse for TextEmphasisStyle {
} }
// Handle a pair of keywords // Handle a pair of keywords
let mut shape = input.try(ShapeKeyword::parse).ok(); let mut shape = input.try(TextEmphasisShapeKeyword::parse).ok();
let fill = input.try(FillMode::parse).ok(); let fill = input.try(TextEmphasisFillMode::parse).ok();
if shape.is_none() { if shape.is_none() {
shape = input.try(ShapeKeyword::parse).ok(); shape = input.try(TextEmphasisShapeKeyword::parse).ok();
} }
// At least one of shape or fill must be handled // At least one of shape or fill must be handled
let keyword_value = match (fill, shape) { let keyword_value = match (fill, shape) {
(Some(fill), Some(shape)) => KeywordValue::FillAndShape(fill, shape), (Some(fill), Some(shape)) => TextEmphasisKeywordValue::FillAndShape(fill, shape),
(Some(fill), None) => KeywordValue::Fill(fill), (Some(fill), None) => TextEmphasisKeywordValue::Fill(fill),
(None, Some(shape)) => KeywordValue::Shape(shape), (None, Some(shape)) => TextEmphasisKeywordValue::Shape(shape),
_ => return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)), _ => return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)),
}; };
Ok(TextEmphasisStyle::Keyword(keyword_value)) Ok(TextEmphasisStyle::Keyword(keyword_value))