mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #16166 - streichgeorg:initial-letter, r=emilio
initial-letter property <!-- Please describe your changes on the following line: --> Implemented parsing and serialization for the initial-letter property. --- <!-- 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 #15959 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/16166) <!-- Reviewable:end -->
This commit is contained in:
commit
04d12fa8f8
3 changed files with 98 additions and 0 deletions
|
@ -230,3 +230,74 @@ ${helpers.predefined_type(
|
||||||
products="gecko",
|
products="gecko",
|
||||||
animatable=True,
|
animatable=True,
|
||||||
spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color")}
|
spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color")}
|
||||||
|
|
||||||
|
<%helpers:longhand name="initial-letter"
|
||||||
|
animatable="False"
|
||||||
|
products="none"
|
||||||
|
spec="https://drafts.csswg.org/css-inline/#sizing-drop-initials">
|
||||||
|
use std::fmt;
|
||||||
|
use style_traits::ToCss;
|
||||||
|
use values::HasViewportPercentage;
|
||||||
|
use values::computed::ComputedValueAsSpecified;
|
||||||
|
use values::specified::{Number, Integer};
|
||||||
|
|
||||||
|
impl ComputedValueAsSpecified for SpecifiedValue {}
|
||||||
|
no_viewport_percentage!(SpecifiedValue);
|
||||||
|
|
||||||
|
#[derive(PartialEq, Clone, Debug)]
|
||||||
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
pub enum SpecifiedValue {
|
||||||
|
Normal,
|
||||||
|
Specified(Number, Option<Integer>)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod computed_value {
|
||||||
|
pub use super::SpecifiedValue as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for SpecifiedValue {
|
||||||
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
|
match *self {
|
||||||
|
SpecifiedValue::Normal => try!(dest.write_str("normal")),
|
||||||
|
SpecifiedValue::Specified(size, sink) => {
|
||||||
|
try!(size.to_css(dest));
|
||||||
|
if let Some(sink) = sink {
|
||||||
|
try!(dest.write_str(" "));
|
||||||
|
try!(sink.to_css(dest));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn get_initial_value() -> computed_value::T {
|
||||||
|
computed_value::T::Normal
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn get_initial_specified_value() -> SpecifiedValue {
|
||||||
|
SpecifiedValue::Normal
|
||||||
|
}
|
||||||
|
|
||||||
|
/// normal | <number> <integer>?
|
||||||
|
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
|
||||||
|
if input.try(|input| input.expect_ident_matching("normal")).is_ok() {
|
||||||
|
return Ok(SpecifiedValue::Normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
let size = try!(Number::parse_at_least_one(input));
|
||||||
|
|
||||||
|
match input.try(|input| Integer::parse(context, input)) {
|
||||||
|
Ok(number) => {
|
||||||
|
if number.value() < 1 {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
Ok(SpecifiedValue::Specified(size, Some(number)))
|
||||||
|
}
|
||||||
|
Err(()) => Ok(SpecifiedValue::Specified(size, None)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</%helpers:longhand>
|
||||||
|
|
|
@ -99,6 +99,7 @@ mod outline;
|
||||||
mod position;
|
mod position;
|
||||||
mod selectors;
|
mod selectors;
|
||||||
mod supports;
|
mod supports;
|
||||||
|
mod text;
|
||||||
mod text_overflow;
|
mod text_overflow;
|
||||||
mod transition_timing_function;
|
mod transition_timing_function;
|
||||||
mod ui;
|
mod ui;
|
||||||
|
|
26
tests/unit/style/parsing/text.rs
Normal file
26
tests/unit/style/parsing/text.rs
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
use cssparser::Parser;
|
||||||
|
use media_queries::CSSErrorReporterTest;
|
||||||
|
use parsing::parse;
|
||||||
|
use style::parser::ParserContext;
|
||||||
|
use style::stylesheets::Origin;
|
||||||
|
use style_traits::ToCss;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn initial_letter_should_be_parsed_correctly() {
|
||||||
|
use style::properties::longhands::initial_letter;
|
||||||
|
|
||||||
|
assert_roundtrip_with_context!(initial_letter::parse, "1.5");
|
||||||
|
assert_roundtrip_with_context!(initial_letter::parse, "1.5 3");
|
||||||
|
assert_roundtrip_with_context!(initial_letter::parse, "normal");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn initial_letter_doesnt_parse_invalid_input() {
|
||||||
|
use style::properties::longhands::initial_letter;
|
||||||
|
|
||||||
|
assert!(parse(initial_letter::parse, "1.5x 5").is_err());
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue