Diff
Modified: trunk/LayoutTests/ChangeLog (117389 => 117390)
--- trunk/LayoutTests/ChangeLog 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/ChangeLog 2012-05-17 03:55:41 UTC (rev 117390)
@@ -1,3 +1,46 @@
+2012-05-16 Luke Macpherson <[email protected]>
+
+ Add tests for CSS Variables.
+ https://bugs.webkit.org/show_bug.cgi?id=86575
+
+ Reviewed by Dimitri Glazkov.
+
+ * fast/css/variables/colors-test-expected.html: Added.
+ * fast/css/variables/colors-test.html: Added.
+ * fast/css/variables/complex-cycle-expected.html: Added.
+ * fast/css/variables/complex-cycle.html: Added.
+ * fast/css/variables/computed-style-expected.html: Added.
+ * fast/css/variables/computed-style.html: Added.
+ * fast/css/variables/inherited-values-expected.html: Added.
+ * fast/css/variables/inherited-values.html: Added.
+ * fast/css/variables/inline-styles-expected.html: Added.
+ * fast/css/variables/inline-styles.html: Added.
+ * fast/css/variables/invalid-shorthand-expected.html: Added.
+ * fast/css/variables/invalid-shorthand.html: Added.
+ * fast/css/variables/invalid-variable-value-expected.html: Added.
+ * fast/css/variables/invalid-variable-value.html: Added.
+ * fast/css/variables/multi-level-cycle-expected.html: Added.
+ * fast/css/variables/multi-level-cycle.html: Added.
+ * fast/css/variables/redefinition-expected.html: Added.
+ * fast/css/variables/redefinition.html: Added.
+ * fast/css/variables/shorthand-expected.html: Added.
+ * fast/css/variables/shorthand.html: Added.
+ * fast/css/variables/simple-cycle-expected.html: Added.
+ * fast/css/variables/simple-cycle.html: Added.
+ * fast/css/variables/undefined-expected.html: Added.
+ * fast/css/variables/undefined.html: Added.
+ * fast/css/variables/use-before-defined-expected.html: Added.
+ * fast/css/variables/use-before-defined.html: Added.
+ * fast/css/variables/var-inside-shorthand-expected.html: Added.
+ * fast/css/variables/var-inside-shorthand.html: Added.
+ * fast/css/variables/variable-chain-expected.html: Added.
+ * fast/css/variables/variable-chain.html: Added.
+ * platform/chromium/test_expectations.txt: Skip tests until variables implementation lands.
+ * platform/efl/test_expectations.txt: Skip tests until variables implementation lands.
+ * platform/gtk/test_expectations.txt: Skip tests until variables implementation lands.
+ * platform/mac/test_expectations.txt: Skip tests until variables implementation lands.
+ * platform/qt/test_expectations.txt: Skip tests until variables implementation lands.
+
2012-05-16 MORITA Hajime <[email protected]>
Unreviewed, marking failing test.
Added: trunk/LayoutTests/fast/css/variables/colors-test-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/colors-test-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/colors-test-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,8 @@
+<style>
+body {
+ color: green;
+ background-color: red;
+ background-color: rgb(255, 255, 255);
+}
+</style>
+This text should be green on a white background. There should be no red visible.
Added: trunk/LayoutTests/fast/css/variables/colors-test.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/colors-test.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/colors-test.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,10 @@
+<style>
+body {
+ -webkit-var-foreground: green;
+ -webkit-var-background: rgb(255, 255, 255);
+ color: -webkit-var(foreground);
+ background-color: red;
+ background-color: -webkit-var(background);
+}
+</style>
+This text should be green on a white background. There should be no red visible.
Added: trunk/LayoutTests/fast/css/variables/complex-cycle-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/complex-cycle-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/complex-cycle-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1 @@
+This test is successful if it does not result in a crash.
Added: trunk/LayoutTests/fast/css/variables/complex-cycle.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/complex-cycle.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/complex-cycle.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,12 @@
+<style>
+body {
+ -webkit-var-a: -webkit-var(f);
+ -webkit-var-b: -webkit-var(a);
+ -webkit-var-c: -webkit-var(b);
+ -webkit-var-d: -webkit-var(c);
+ -webkit-var-e: -webkit-var(d);
+ -webkit-var-f: -webkit-var(e);
+ color: -webkit-var(a);
+}
+</style>
+This test is successful if it does not result in a crash.
Added: trunk/LayoutTests/fast/css/variables/computed-style-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/computed-style-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/computed-style-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,8 @@
+<style>
+body {
+ font-weight: bold;
+}
+</style>
+<body>
+Test passed - computed font weight is bold
+</body>
Added: trunk/LayoutTests/fast/css/variables/computed-style.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/computed-style.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/computed-style.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,18 @@
+<style>
+body {
+ -webkit-var-a: bold;
+ font-weight: normal;
+ font-weight: -webkit-var(a);
+}
+</style>
+<body>
+Test failed - JS did not run
+</body>
+<script>
+var element = document.body;
+var weight = window.getComputedStyle(element, null).getPropertyValue("font-weight");
+if (weight == "bold")
+ element.innerHTML = "Test passed - computed font weight is bold";
+else
+ element.innerHTML = "Test failed - computed color is " + weight;
+</script>
Added: trunk/LayoutTests/fast/css/variables/inherited-values-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/inherited-values-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/inherited-values-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,9 @@
+<style>
+div {
+ color: green;
+ background-color: rgb(255, 255, 255);
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Added: trunk/LayoutTests/fast/css/variables/inherited-values.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/inherited-values.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/inherited-values.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,14 @@
+<style>
+body {
+ -webkit-var-foreground: green;
+ -webkit-var-background: rgb(255, 255, 255);
+}
+div {
+ color: -webkit-var(foreground);
+ background-color: red;
+ background-color: -webkit-var(background);
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Added: trunk/LayoutTests/fast/css/variables/inline-styles-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/inline-styles-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/inline-styles-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,3 @@
+<div style="color: green;">
+This text should be green on a white background.
+</div>
Added: trunk/LayoutTests/fast/css/variables/inline-styles.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/inline-styles.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/inline-styles.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,5 @@
+<body style="-webkit-var-a: green;">
+<div style="color: -webkit-var(a);">
+This text should be green on a white background.
+</div>
+</body>
Added: trunk/LayoutTests/fast/css/variables/invalid-shorthand-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/invalid-shorthand-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/invalid-shorthand-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,3 @@
+<div>
+This text should not be surrounded by a border.
+</div>
Added: trunk/LayoutTests/fast/css/variables/invalid-shorthand.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/invalid-shorthand.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/invalid-shorthand.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,9 @@
+<style>
+div {
+ -webkit-var-a: 10px solid green;
+ border: 10px -webkit-var(a) blue;
+}
+</style>
+<div>
+This text should not be surrounded by a border.
+</div>
Added: trunk/LayoutTests/fast/css/variables/invalid-variable-value-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/invalid-variable-value-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/invalid-variable-value-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,3 @@
+<div>
+This text should be black.
+</div>
Added: trunk/LayoutTests/fast/css/variables/invalid-variable-value.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/invalid-variable-value.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/invalid-variable-value.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,10 @@
+<style>
+div {
+ -webkit-var-a: green;
+ -webkit-var-a: 10px;
+ color: -webkit-var(a);
+}
+</style>
+<div>
+This text should be black.
+</div>
Added: trunk/LayoutTests/fast/css/variables/multi-level-cycle-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/multi-level-cycle-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/multi-level-cycle-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,7 @@
+<div>
+<div>
+<div>
+This test is successful if this text is black, and the test does not result in a crash.
+</div>
+</div>
+</div>
Added: trunk/LayoutTests/fast/css/variables/multi-level-cycle.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/multi-level-cycle.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/multi-level-cycle.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,20 @@
+<style>
+.a {
+ -webkit-var-a: -webkit-var(b);
+ -webkit-var-b: red;
+}
+.b {
+ -webkit-var-b: -webkit-var(a);
+}
+.c {
+ -webkit-var-c: -webkit-var(a);
+ color: -webkit-var(c);
+}
+</style>
+<div id="a">
+<div id="b">
+<div id="c">
+This test is successful if this text is black, and the test does not result in a crash.
+</div>
+</div>
+</div>
Added: trunk/LayoutTests/fast/css/variables/redefinition-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/redefinition-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/redefinition-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,9 @@
+<div style="color: red;">
+This text should be red.
+</div>
+<div id="a" style="color: green;">
+This text should be green.
+</div>
+<div id="b" style="color: blue;">
+This text should be blue.
+</div>
Added: trunk/LayoutTests/fast/css/variables/redefinition.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/redefinition.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/redefinition.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,23 @@
+<style>
+body {
+ -webkit-var-a: red;
+}
+#a {
+ -webkit-var-a: green;
+}
+#b {
+ -webkit-var-a: blue;
+}
+div {
+ color: -webkit-var(a);
+}
+</style>
+<div>
+This text should be red.
+</div>
+<div id="a">
+This text should be green.
+</div>
+<div id="b">
+This text should be blue.
+</div>
Added: trunk/LayoutTests/fast/css/variables/shorthand-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/shorthand-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/shorthand-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,8 @@
+<style>
+div {
+ border: 10px solid green;
+}
+</style>
+<div>
+This text should be surrounded by a green border. There should not be a red border.
+</div>
Added: trunk/LayoutTests/fast/css/variables/shorthand.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/shorthand.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/shorthand.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,10 @@
+<style>
+div {
+ -webkit-var-myborder: 10px solid green;
+ border: 10px dashed red;
+ border: -webkit-var(myborder);
+}
+</style>
+<div>
+This text should be surrounded by a green border. There should not be a red border.
+</div>
Added: trunk/LayoutTests/fast/css/variables/simple-cycle-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/simple-cycle-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/simple-cycle-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1 @@
+This test is successful if it does not result in a crash.
Added: trunk/LayoutTests/fast/css/variables/simple-cycle.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/simple-cycle.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/simple-cycle.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,7 @@
+<style>
+body {
+ -webkit-var-a: -webkit-var(a);
+ color: -webkit-var(a);
+}
+</style>
+This test is successful if it does not result in a crash.
Added: trunk/LayoutTests/fast/css/variables/undefined-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/undefined-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/undefined-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1 @@
+Test successful if it does not cause a crash.
Added: trunk/LayoutTests/fast/css/variables/undefined.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/undefined.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/undefined.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,6 @@
+<style>
+body {
+ border: -webkit-var(myborder);
+}
+</style>
+Test successful if it does not cause a crash.
Added: trunk/LayoutTests/fast/css/variables/use-before-defined-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/use-before-defined-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/use-before-defined-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,8 @@
+<style>
+div {
+ color: green;
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Added: trunk/LayoutTests/fast/css/variables/use-before-defined.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/use-before-defined.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/use-before-defined.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,13 @@
+<style>
+div {
+ color: -webkit-var(a);
+ -webkit-var-a: -webkit-var(b);
+}
+body {
+ -webkit-var-b: -webkit-var(c);
+ -webkit-var-c: green;
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Added: trunk/LayoutTests/fast/css/variables/var-inside-shorthand-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/var-inside-shorthand-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/var-inside-shorthand-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,7 @@
+<style>
+body {
+ border: 10px solid green;
+}
+</style>
+This text should be surrounded by a green border. There should be no red visible.
+
Added: trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/var-inside-shorthand.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,9 @@
+<style>
+body {
+ -webkit-var-MyBorderColor: green;
+ border: 10px solid red;
+ border: 10px solid -webkit-var(MyBorderColor);
+}
+</style>
+This text should be surrounded by a green border. There should be no red visible.
+
Added: trunk/LayoutTests/fast/css/variables/variable-chain-expected.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/variable-chain-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/variable-chain-expected.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,8 @@
+<style>
+div {
+ color: green;
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Added: trunk/LayoutTests/fast/css/variables/variable-chain.html (0 => 117390)
--- trunk/LayoutTests/fast/css/variables/variable-chain.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/variable-chain.html 2012-05-17 03:55:41 UTC (rev 117390)
@@ -0,0 +1,14 @@
+<style>
+body {
+ -webkit-var-c: green;
+ -webkit-var-b: -webkit-var(c);
+}
+div {
+ color: red;
+ -webkit-var-a: -webkit-var(b);
+ color: -webkit-var(a);
+}
+</style>
+<div>
+This text should be green on a white background. There should be no red visible.
+</div>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (117389 => 117390)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-17 03:55:41 UTC (rev 117390)
@@ -149,6 +149,9 @@
// The intent tag is not yet enabled.
BUGGBILLOCK SKIP : webintents/intent-tag.html = FAIL
+// CSS Variables are not yet enabled.
+BUGWK85580 SKIP : fast/css/variables = PASS FAIL
+
// -----------------------------------------------------------------
// WONTFIX TESTS
// -----------------------------------------------------------------
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (117389 => 117390)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-17 03:55:41 UTC (rev 117390)
@@ -20,6 +20,9 @@
// Exclusions implementation not complete yet.
BUGWK83898 SKIP : fast/exclusions = FAIL
+// CSS Variables are not yet enabled.
+BUGWK85580 SKIP : fast/css/variables = PASS FAIL
+
BUGWK83906 : ietestcenter/css3/grid/grid-column-001.htm = IMAGE
BUGWK83907 : ietestcenter/css3/grid/grid-column-002.htm = IMAGE
BUGWK83909 : ietestcenter/css3/grid/grid-column-003.htm = IMAGE
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (117389 => 117390)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-17 03:55:41 UTC (rev 117390)
@@ -302,6 +302,9 @@
// Mediastream implementation is not complete yet.
BUGWK79203 SKIP : fast/mediastream = FAIL
+// CSS Variables are not yet enabled.
+BUGWK85580 SKIP : fast/css/variables = PASS FAIL
+
//////////////////////////////////////////////////////////////////////////////////////////
// End of Expected failures
//////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (117389 => 117390)
--- trunk/LayoutTests/platform/mac/test_expectations.txt 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt 2012-05-17 03:55:41 UTC (rev 117390)
@@ -9,6 +9,9 @@
BUGWK76439 DEBUG : fast/dom/shadow/content-element-api.html = TEXT
BUGWK76439 DEBUG : fast/dom/shadow/content-element-outside-shadow.html = TEXT
+// CSS Variables are not yet enabled.
+BUGWK85580 SKIP : fast/css/variables = PASS FAIL
+
// Our slow tests, in alphabetical order.
BUGWK57672 : http/tests/local/fileapi/send-sliced-dragged-file.html = TEXT PASS
Modified: trunk/LayoutTests/platform/qt/test_expectations.txt (117389 => 117390)
--- trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-17 03:52:17 UTC (rev 117389)
+++ trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-17 03:55:41 UTC (rev 117390)
@@ -75,3 +75,6 @@
BUGWK84167 : fast/css-generated-content/nested-tables-with-before-after-content-crash.html = IMAGE+TEXT
BUGWK84167 : fast/inline-block/001.html = IMAGE+TEXT
BUGWK84167 : tables/mozilla/bugs/bug2479-2.html = IMAGE+TEXT
+
+// CSS Variables are not yet enabled.
+BUGWK85580 SKIP : fast/css/variables = PASS FAIL
