Auto merge of #8343 - servo:custom-properties, r=mbrubeck

Fix some custom properties bugs

Fix #7767.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8343)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-07 06:02:36 +05:30
commit faf2f34772
19 changed files with 422 additions and 509 deletions

View file

@ -17,13 +17,11 @@ path = "../../../components/style_traits"
[dependencies.util]
path = "../../../components/util"
[dependencies.selectors]
git = "https://github.com/servo/rust-selectors"
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
url = "0.2"
cssparser = "0.3.1"
cssparser = "0.4"
selectors = "0.2"
string_cache = "0.1"
string_cache_plugin = "0.1"
euclid = {version = "0.3", features = ["plugins"]}

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

View file

@ -1,116 +0,0 @@
[test_variable_serialization_specified.html]
type: testharness
[`var(--a)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a) ` is unchanged by specified value serialization]
expected: FAIL
[`var( --a ) ` is unchanged by specified value serialization]
expected: FAIL
[`var(--a, )` is unchanged by specified value serialization]
expected: FAIL
[`var(--a,/**/a)` is unchanged by specified value serialization]
expected: FAIL
[`1px var(--a)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a) 1px` is unchanged by specified value serialization]
expected: FAIL
[`something 3px url(whereever) calc(var(--a) + 1px)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a)var(--b)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a, var(--b, var(--c, black)))` is unchanged by specified value serialization]
expected: FAIL
[`var(--a) <!--` is unchanged by specified value serialization]
expected: FAIL
[`--> var(--a)` is unchanged by specified value serialization]
expected: FAIL
[`{ [ var(--a) \] }` is unchanged by specified value serialization]
expected: FAIL
[`[;\] var(--a)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a,(;))` is unchanged by specified value serialization]
expected: FAIL
[`VAR(--a)` is unchanged by specified value serialization]
expected: FAIL
[`var(--0)` is unchanged by specified value serialization]
expected: FAIL
[`var(--\\30)` is unchanged by specified value serialization]
expected: FAIL
[`var(--\\d800)` is unchanged by specified value serialization]
expected: FAIL
[`var(--\\ffffff)` is unchanged by specified value serialization]
expected: FAIL
[`var(--a` becomes `var(--a)` in specified value serialization]
expected: FAIL
[`var(--a , ` becomes `var(--a , )` in specified value serialization]
expected: FAIL
[`var(--a, ` becomes `var(--a, )` in specified value serialization]
expected: FAIL
[`var(--a, var(--b` becomes `var(--a, var(--b))` in specified value serialization]
expected: FAIL
[`var(--a /* unclosed comment` becomes `var(--a /* unclosed comment*/)` in specified value serialization]
expected: FAIL
[`var(--a /* unclosed comment *` becomes `var(--a /* unclosed comment */)` in specified value serialization]
expected: FAIL
[`[{(((var(--a` becomes `[{(((var(--a))))}\]` in specified value serialization]
expected: FAIL
[`var(--a, "unclosed string` becomes `var(--a, "unclosed string")` in specified value serialization]
expected: FAIL
[`var(--a, 'unclosed string` becomes `var(--a, 'unclosed string')` in specified value serialization]
expected: FAIL
[`var(--a) "unclosed string\\` becomes `var(--a) "unclosed string"` in specified value serialization]
expected: FAIL
[`var(--a) 'unclosed string\\` becomes `var(--a) 'unclosed string'` in specified value serialization]
expected: FAIL
[`var(--a) \\` becomes `var(--a) \\<5C>` in specified value serialization]
expected: FAIL
[`var(--a) url(unclosedurl` becomes `var(--a) url(unclosedurl)` in specified value serialization]
expected: FAIL
[`var(--a) url('unclosedurl` becomes `var(--a) url('unclosedurl')` in specified value serialization]
expected: FAIL
[`var(--a) url("unclosedurl` becomes `var(--a) url("unclosedurl")` in specified value serialization]
expected: FAIL
[`var(--a) url(unclosedurl\\` becomes `var(--a) url(unclosedurl\\<5C>)` in specified value serialization]
expected: FAIL
[`var(--a) url('unclosedurl\\` becomes `var(--a) url('unclosedurl')` in specified value serialization]
expected: FAIL
[`var(--a) url("unclosedurl\\` becomes `var(--a) url("unclosedurl")` in specified value serialization]
expected: FAIL

View file

@ -104,11 +104,6 @@ function test_specified_value_serialization(value, expected) {
div1.style.removeProperty("margin");
}
/*
function test(f) { f() }
function assert_equals(a, b, m) { if (a == b) { console.log("`"+a+"`", "`"+b+"`", m) } }
*/
values_with_unchanged_specified_value_serialization.forEach(function(value) {
test(function() { test_specified_value_serialization(value, value) },
"`" + value + "` is unchanged by specified value serialization");