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

Fix double /**//**/

Browse source
This commit is contained in:
Simon Sapin 2015-11-04 16:06:34 +01:00
parent 40e6cc118e
commit 3973085cb6
2 changed files with 5 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/custom_properties.rs
View file

@ -74,6 +74,11 @@ impl ComputedValue {
fn push(&mut self, css: &str, css_first_token_type: TokenSerializationType, fn push(&mut self, css: &str, css_first_token_type: TokenSerializationType,
css_last_token_type: TokenSerializationType) { css_last_token_type: TokenSerializationType) {
// This happens e.g. between to subsequent var() functions: `var(--a)var(--b)`.
// In that case, css_*_token_type is non-sensical.
if css.is_empty() {
return
}
self.first_token_type.set_if_nothing(css_first_token_type); self.first_token_type.set_if_nothing(css_first_token_type);
// If self.first_token_type was nothing, // If self.first_token_type was nothing,
// self.last_token_type is also nothing and this will be false: // self.last_token_type is also nothing and this will be false:

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

@ -1,53 +0,0 @@
[test_variable_serialization_computed.html]
type: testharness
[subtest #20 with `--a: var(--b)var(--c); --b:orange; --c:red;`]
expected: FAIL
[subtest #21 with `--a: var(--b)var(--c,red); --b:orange;`]
expected: FAIL
[subtest #22 with `--a: var(--b,orange)var(--c); --c:red;`]
expected: FAIL
[subtest #24 with `--a: var(--b)var(--c); --c:[c\]; --b:('ab`]
expected: FAIL
[subtest #25 with `--a: '`]
expected: FAIL
[subtest #26 with `--a: '\\`]
expected: FAIL
[subtest #27 with `--a: \\`]
expected: FAIL
[subtest #28 with `--a: "`]
expected: FAIL
[subtest #29 with `--a: "\\`]
expected: FAIL
[subtest #30 with `--a: /* abc `]
expected: FAIL
[subtest #31 with `--a: /* abc *`]
expected: FAIL
[subtest #32 with `--a: url(http://example.org/`]
expected: FAIL
[subtest #33 with `--a: url(http://example.org/\\`]
expected: FAIL
[subtest #34 with `--a: url('http://example.org/`]
expected: FAIL
[subtest #35 with `--a: url('http://example.org/\\`]
expected: FAIL
[subtest #36 with `--a: url("http://example.org/`]
expected: FAIL
[subtest #37 with `--a: url("http://example.org/\\`]
expected: FAIL