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

Auto merge of #8321 - servo:reset-zero, r=Ms2ger

Browse source 
counter-reset defaults to 0, not 1.

https://drafts.csswg.org/css2/generate.html#counters

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8321)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-04 17:52:23 +05:30
commit df4e614179
6 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/properties.mako.rs
View file

@ -1272,7 +1272,7 @@ pub mod longhands {
use super::content; use super::content;
use values::computed::ComputedValueAsSpecified; use values::computed::ComputedValueAsSpecified;
use cssparser::{ToCss, Token}; use cssparser::{ToCss, Token, serialize_identifier};
use std::borrow::{Cow, ToOwned}; use std::borrow::{Cow, ToOwned};
pub use self::computed_value::T as SpecifiedValue; pub use self::computed_value::T as SpecifiedValue;
@ -1297,7 +1297,7 @@ pub mod longhands {
try!(dest.write_str(" ")); try!(dest.write_str(" "));
} }
first = false; first = false;
try!(Token::QuotedString(Cow::from(&*pair.0)).to_css(dest)); try!(serialize_identifier(&pair.0, dest));
try!(write!(dest, " {}", pair.1)); try!(write!(dest, " {}", pair.1));
} }
Ok(()) Ok(())
@ -1305,6 +1305,10 @@ pub mod longhands {
} }
pub fn parse(_: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> { pub fn parse(_: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
parse_common(1, input)
}
pub fn parse_common(default_value: i32, input: &mut Parser) -> Result<SpecifiedValue,()> {
if input.try(|input| input.expect_ident_matching("none")).is_ok() { if input.try(|input| input.expect_ident_matching("none")).is_ok() {
return Ok(SpecifiedValue(Vec::new())) return Ok(SpecifiedValue(Vec::new()))
} }
@ -1320,7 +1324,7 @@ pub mod longhands {
return Err(()) return Err(())
} }
let counter_delta = let counter_delta =
input.try(|input| specified::parse_integer(input)).unwrap_or(1); input.try(|input| specified::parse_integer(input)).unwrap_or(default_value);
counters.push((counter_name, counter_delta)) counters.push((counter_name, counter_delta))
} }
@ -1334,7 +1338,11 @@ pub mod longhands {
<%self:longhand name="counter-reset"> <%self:longhand name="counter-reset">
pub use super::counter_increment::{SpecifiedValue, computed_value, get_initial_value}; pub use super::counter_increment::{SpecifiedValue, computed_value, get_initial_value};
pub use super::counter_increment::{parse}; use super::counter_increment::{parse_common};
pub fn parse(_: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
parse_common(0, input)
}
</%self:longhand> </%self:longhand>
// CSS 2.1, Section 13 - Paged media // CSS 2.1, Section 13 - Paged media

3
tests/wpt/metadata-css/css21_dev/html4/counters-001.htm.ini
View file

@ -1,3 +0,0 @@
[counters-001.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/counters-004.htm.ini
View file

@ -1,3 +0,0 @@
[counters-004.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/counters-006.htm.ini
View file

@ -1,3 +0,0 @@
[counters-006.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/counters-008.htm.ini
View file

@ -1,3 +0,0 @@
[counters-008.htm]
type: reftest
expected: FAIL

3
tests/wpt/mozilla/meta/css/test_variable_serialization_computed.html.ini
View file

@ -9,9 +9,6 @@
[subtest #22 with `--a: var(--b,orange)var(--c); --c:red;`] [subtest #22 with `--a: var(--b,orange)var(--c); --c:red;`]
expected: FAIL expected: FAIL
[subtest #23 with `counter-reset: var(--a)red; --a:orange;`]
expected: FAIL
[subtest #24 with `--a: var(--b)var(--c); --c:[c\]; --b:('ab`] [subtest #24 with `--a: var(--b)var(--c); --c:[c\]; --b:('ab`]
expected: FAIL expected: FAIL