Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom properties, take 2 #7555

Merged
merged 10 commits into from Sep 17, 2015
+963 −314
Merged

Custom properties, take 2 #7555

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4abe7cd
Support var() in shorthands.
SimonSapin Sep 3, 2015
c7622bf
Fix !important in custom properties.
SimonSapin Sep 7, 2015
ab9e1af
Allow whitespace-only custom property values.
SimonSapin Sep 7, 2015
54ef805
The function name var() is case-insensitive.
SimonSapin Sep 7, 2015
70ea5f6
Don’t ignore input at the end of a declaration with var().
SimonSapin Sep 7, 2015
389d537
Look for var() in a non-custom property declaration after a parse error.
SimonSapin Sep 7, 2015
b8fd51e
Add a copy of a test that uses a style attribute instead of a stylesh…
SimonSapin Sep 8, 2015
81dd1ab
Record first and last token type of custom property values.
SimonSapin Sep 9, 2015
d56ea10
var() substitution: insert /**/ between tokens that would be parse as…
SimonSapin Sep 9, 2015
feaf6f4
Initial support for custom properties in CSSStyleDeclaration
SimonSapin Sep 11, 2015
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Add a copy of a test that uses a style attribute instead of a stylesh… 

…eet.

`tests/wpt/css-tests/css-variables-1_dev/html/test_variable_legal_values.htm`
relies on setting `.data` on a text node inside a `<style>` element
to update a stylesheet, but this doesn’t work on Servo yet.

Add a copy of this file that uses a style attribute instead.
  • Loading branch information
@SimonSapin
SimonSapin committed Sep 17, 2015
commit b8fd51e9403ca941acdc09e55851b377c0359fee
6 tests/wpt/mozilla/meta/MANIFEST.json
View file
Open in desktop
@@ -281,6 +281,12 @@
]
},
"testharness": {
"css/test_variable_legal_values.html": [
{
"path": "css/test_variable_legal_values.html",
"url": "/_mozilla/css/test_variable_legal_values.html"
}
],
"mozilla/DOMParser.html": [
{
"path": "mozilla/DOMParser.html",
119 tests/wpt/mozilla/tests/css/test_variable_legal_values.html
View file
Open in desktop
@@ -0,0 +1,119 @@
<!DOCTYPE html>
<html><head>
<title>CSS Variables Allowed Syntax</title>
<link href="http://dbaron.org/" rel="author" title="L. David Baron">
<link href="http://mozilla.com/" rel="author" title="Mozilla Corporation">
<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
<meta content='The <value> type used in the syntax above is defined as anything matching the "value" production in CSS 2.1 Chapter 4.1 [CSS21].' name="assert">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script id="metadata_cache">/*
{
"percentage": { "assert": "Value allowed within variable: percentage" },
"number": { "assert": "Value allowed within variable: number" },
"length": { "assert": "Value allowed within variable: length" },
"time": { "assert": "Value allowed within variable: time" },
"function": { "assert": "Value allowed within variable: function" },
"nested_function": { "assert": "Value allowed within variable: nested function" },
"parentheses": { "assert": "Value allowed within variable: parentheses" },
"braces": { "assert": "Value allowed within variable: braces" },
"brackets": { "assert": "Value allowed within variable: brackets" },
"at_keyword_unknown": { "assert": "Value allowed within variable: at-keyword (unknown)" },
"at_keyword_known": { "assert": "Value allowed within variable: at-keyword (known)" },
"at_keyword_unknown_and_block": { "assert": "Value allowed within variable: at-keyword (unknown) and block" },
"at_keyword_known_and_block": { "assert": "Value allowed within variable: at-keyword (known) and block" },
"unbalanced_close_bracket_at_toplevel": { "assert": "Value not allowed within variable: unbalanced close bracket at toplevel" },
"unbalanced_close_paren_at_toplevel": { "assert": "Value not allowed within variable: unbalanced close paren at toplevel" },
"unbalanced_close_bracket_in_something_balanced": { "assert": "Value not allowed within variable: unbalanced close bracket in something balanced" },
"unbalanced_close_paren_in_something_balanced": { "assert": "Value not allowed within variable: unbalanced close paren in something balanced" },
"unbalanced_close_brace_in_something_balanced": { "assert": "Value not allowed within variable: unbalanced close brace in something balanced" },
"CDO_at_top_level": { "assert": "Value allowed within variable: CDO at top level" },
"CDC_at_top_level": { "assert": "Value allowed within variable: CDC at top level" },
"semicolon_not_at_top_level_value_unused": { "assert": "Value allowed within variable: semicolon not at top level (value -> unused)" },
"CDO_not_at_top_level_value_unused": { "assert": "Value allowed within variable: CDO not at top level (value -> unused)" },
"CDC_not_at_top_level_value_unused": { "assert": "Value allowed within variable: CDC not at top level (value -> unused)" }
}
*/</script>
</head>
<body onload="run()">
<div id="log"></div>
<div id="test"></div>
<script>
setup({ "explicit_done": true });

function run() {
// Setup the iframe
var div = document.getElementById("test");
var test_cs = window.getComputedStyle(div, "");

var initial_cs = test_cs.backgroundColor;
div.setAttribute("style", "background-color: green");
var green_cs = test_cs.backgroundColor;
div.setAttribute("style", "background-color: red");
var red_cs = test_cs.backgroundColor;

function description_to_name(description) {
return description.replace(/\W+/g, "_").replace(/^_/, "").replace(/_$/, "");
}

function assert_allowed_variable_value(value, description) {
test(function() {
div.setAttribute("style",
" --test: red;\n" +
" --test: " + value + ";\n" +
" background-color: red;\n" +
" background-color: var(--test);\n" +
"");
assert_not_equals(initial_cs, red_cs);
assert_equals(initial_cs, test_cs.backgroundColor);
},
description_to_name(description),
{ assert: "Value allowed within variable: " + description });
}

function assert_disallowed_balanced_variable_value(value, description) {
test(function() {
div.setAttribute("style",
" --test: green;\n" +
" --test: " + value + ";\n" +
" background-color: red;\n" +
" background-color: var(--test);\n" +
"");
assert_not_equals(green_cs, red_cs);
assert_equals(green_cs, test_cs.backgroundColor);
},
description_to_name(description),
{ assert: "Value not allowed within variable: " + description });
}

assert_allowed_variable_value("25%", "percentage");
assert_allowed_variable_value("37", "number");
assert_allowed_variable_value("12em", "length");
assert_allowed_variable_value("75ms", "time");
assert_allowed_variable_value("foo()", "function");
assert_allowed_variable_value("foo(bar())", "nested function");
assert_allowed_variable_value("( )", "parentheses");
assert_allowed_variable_value("{ }", "braces");
assert_allowed_variable_value("[ ]", "brackets");
assert_allowed_variable_value("@foobar", "at-keyword (unknown)");
assert_allowed_variable_value("@media", "at-keyword (known)");
assert_allowed_variable_value("@foobar {}", "at-keyword (unknown) and block");
assert_allowed_variable_value("@media {}", "at-keyword (known) and block");
assert_disallowed_balanced_variable_value("]", "unbalanced close bracket at toplevel");
assert_disallowed_balanced_variable_value(")", "unbalanced close paren at toplevel");
assert_disallowed_balanced_variable_value("(])", "unbalanced close bracket in something balanced");
assert_disallowed_balanced_variable_value("[)]", "unbalanced close paren in something balanced");
assert_disallowed_balanced_variable_value("(})", "unbalanced close brace in something balanced");
assert_allowed_variable_value("<!--", "CDO at top level");
assert_allowed_variable_value("-->", "CDC at top level");
assert_allowed_variable_value("(;)", "semicolon not at top level (value -> unused)");
assert_allowed_variable_value("(<!--)", "CDO not at top level (value -> unused)");
assert_allowed_variable_value("(-->)", "CDC not at top level (value -> unused)");

done();
}

</script>


</body></html>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.