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

fix to ensure all font-weight keywords are preserved

Browse source
This commit is contained in:
Atheed Thameem 2017-02-02 20:31:39 -05:00
parent c48a326fb3
commit 17c74cf967
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/properties/longhand/font.mako.rs
View file

@ -230,6 +230,8 @@ ${helpers.single_keyword("font-variant-caps",
#[derive(Debug, Clone, PartialEq, Eq, Copy)] #[derive(Debug, Clone, PartialEq, Eq, Copy)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum SpecifiedValue { pub enum SpecifiedValue {
Normal,
Bold,
Bolder, Bolder,
Lighter, Lighter,
% for weight in range(100, 901, 100): % for weight in range(100, 901, 100):
@ -240,6 +242,8 @@ ${helpers.single_keyword("font-variant-caps",
impl ToCss for SpecifiedValue { impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
SpecifiedValue::Normal => dest.write_str("normal"),
SpecifiedValue::Bold => dest.write_str("bold"),
SpecifiedValue::Bolder => dest.write_str("bolder"), SpecifiedValue::Bolder => dest.write_str("bolder"),
SpecifiedValue::Lighter => dest.write_str("lighter"), SpecifiedValue::Lighter => dest.write_str("lighter"),
% for weight in range(100, 901, 100): % for weight in range(100, 901, 100):
@ -252,8 +256,8 @@ ${helpers.single_keyword("font-variant-caps",
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> { pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
input.try(|input| { input.try(|input| {
match_ignore_ascii_case! { try!(input.expect_ident()), match_ignore_ascii_case! { try!(input.expect_ident()),
"bold" => Ok(SpecifiedValue::Weight700), "normal" => Ok(SpecifiedValue::Normal),
"normal" => Ok(SpecifiedValue::Weight400), "bold" => Ok(SpecifiedValue::Bold),
"bolder" => Ok(SpecifiedValue::Bolder), "bolder" => Ok(SpecifiedValue::Bolder),
"lighter" => Ok(SpecifiedValue::Lighter), "lighter" => Ok(SpecifiedValue::Lighter),
_ => Err(()) _ => Err(())
@ -281,6 +285,8 @@ ${helpers.single_keyword("font-variant-caps",
% for weight in range(100, 901, 100): % for weight in range(100, 901, 100):
SpecifiedValue::Weight${weight} => Ok(computed_value::T::Weight${weight}), SpecifiedValue::Weight${weight} => Ok(computed_value::T::Weight${weight}),
% endfor % endfor
SpecifiedValue::Normal => Ok(computed_value::T::Weight400),
SpecifiedValue::Bold => Ok(computed_value::T::Weight700),
SpecifiedValue::Bolder | SpecifiedValue::Bolder |
SpecifiedValue::Lighter => Err(()) SpecifiedValue::Lighter => Err(())
} }
@ -331,6 +337,8 @@ ${helpers.single_keyword("font-variant-caps",
% for weight in range(100, 901, 100): % for weight in range(100, 901, 100):
SpecifiedValue::Weight${weight} => computed_value::T::Weight${weight}, SpecifiedValue::Weight${weight} => computed_value::T::Weight${weight},
% endfor % endfor
SpecifiedValue::Normal => computed_value::T::Weight400,
SpecifiedValue::Bold => computed_value::T::Weight700,
SpecifiedValue::Bolder => match context.inherited_style().get_font().clone_font_weight() { SpecifiedValue::Bolder => match context.inherited_style().get_font().clone_font_weight() {
computed_value::T::Weight100 => computed_value::T::Weight400, computed_value::T::Weight100 => computed_value::T::Weight400,
computed_value::T::Weight200 => computed_value::T::Weight400, computed_value::T::Weight200 => computed_value::T::Weight400,

17
tests/unit/style/parsing/font.rs
View file

@ -6,7 +6,7 @@ use cssparser::Parser;
use media_queries::CSSErrorReporterTest; use media_queries::CSSErrorReporterTest;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use style::parser::ParserContext; use style::parser::ParserContext;
use style::properties::longhands::font_feature_settings; use style::properties::longhands::{font_feature_settings, font_weight};
use style::properties::longhands::font_feature_settings::computed_value; use style::properties::longhands::font_feature_settings::computed_value;
use style::properties::longhands::font_feature_settings::computed_value::FeatureTagValue; use style::properties::longhands::font_feature_settings::computed_value::FeatureTagValue;
use style::stylesheets::Origin; use style::stylesheets::Origin;
@ -98,6 +98,21 @@ fn font_language_override_should_parse_properly() {
assert_eq!(danish, SpecifiedValue::Override("DAN".to_string())); assert_eq!(danish, SpecifiedValue::Override("DAN".to_string()));
} }
#[test]
fn font_weight_keyword_should_preserve_keyword() {
use style::properties::longhands::font_weight::SpecifiedValue;
let url = ServoUrl::parse("http://localhost").unwrap();
let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
let mut parser = Parser::new("normal");
let result = font_weight::parse(&context, &mut parser);
assert_eq!(result.unwrap(), SpecifiedValue::Normal);
let mut parser = Parser::new("bold");
let result = font_weight::parse(&context, &mut parser);
assert_eq!(result.unwrap(), SpecifiedValue::Bold);
}
#[test] #[test]
#[should_panic] #[should_panic]
fn font_language_override_should_fail_on_empty_str() { fn font_language_override_should_fail_on_empty_str() {

3
tests/wpt/metadata-css/cssom-1_dev/html/index-002.htm.ini
View file

@ -33,6 +33,3 @@
[list is expected to be list-style: circle inside;] [list is expected to be list-style: circle inside;]
expected: FAIL expected: FAIL
[font-family is expected to be font-family: sans-serif; line-height: 2em; font-size: 3em; font-style: italic; font-weight: bold;]
expected: FAIL