Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-05-06 09:17:02 UTC (rev 277076)
@@ -1,5 +1,33 @@
2021-05-06 Tim Nguyen <[email protected]>
+ Re-import css/css-cascade WPT
+ https://bugs.webkit.org/show_bug.cgi?id=225437
+
+ Reviewed by Youenn Fablet.
+
+ * web-platform-tests/css/css-cascade/all-prop-001-expected.html:
+ * web-platform-tests/css/css-cascade/all-prop-001.html:
+ * web-platform-tests/css/css-cascade/all-prop-revert-visited-expected.html: Added.
+ * web-platform-tests/css/css-cascade/all-prop-revert-visited.html: Added.
+ * web-platform-tests/css/css-cascade/all-prop-unset-visited-expected.html: Added.
+ * web-platform-tests/css/css-cascade/all-prop-unset-visited.html: Added.
+ * web-platform-tests/css/css-cascade/import-conditional-001-expected.xht: Added.
+ * web-platform-tests/css/css-cascade/import-conditional-001.html: Added.
+ * web-platform-tests/css/css-cascade/important-prop.html:
+ * web-platform-tests/css/css-cascade/initial-background-color-expected.html: Added.
+ * web-platform-tests/css/css-cascade/initial-background-color.html: Added.
+ * web-platform-tests/css/css-cascade/support/test-green.css: Added.
+ (.test):
+ * web-platform-tests/css/css-cascade/support/test-red.css: Added.
+ (.test):
+ * web-platform-tests/css/css-cascade/support/w3c-import.log: Added.
+ * web-platform-tests/css/css-cascade/unset-val-001.html:
+ * web-platform-tests/css/css-cascade/unset-value-storage.html: Added.
+ * web-platform-tests/css/css-cascade/unset-value-storage-expected.txt: Added.
+ * web-platform-tests/css/css-cascade/w3c-import.log:
+
+2021-05-06 Tim Nguyen <[email protected]>
+
Re-sync css/css-break WPTs
https://bugs.webkit.org/show_bug.cgi?id=225436
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001-expected.html (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001-expected.html 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001-expected.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -2,22 +2,11 @@
<html>
<head>
<meta charset="utf-8">
- <title>CSS Cascade Green Right Square Reference File</title>
- <link rel="author" title="Chris Rebert" href=""
- <style>
-#success {
- width: 100px;
- height: 100px;
- background-color: green;
- float: right;
-}
- </style>
+ <title>CSS Cascade: all shorthand Reference File</title>
</head>
<body>
- <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+ <p>Test passes if the digits are <strong>in order</strong> and there is <strong>no red</strong>.</p>
- <div>
- <div id="success" class="square green above-right"></div>
- </div>
+ <div class="test">123 456 789</div>
</body>
</html>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001.html (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001.html 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-001.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -2,43 +2,48 @@
<html>
<head>
<meta charset="utf-8">
- <title>CSS Cascade: "all" shorthand property excludes "direction"</title>
+ <title>CSS Cascade: "all" shorthand property excludes "direction" and "unicode-bidi"</title>
+ <link rel="author" title="Elika J. Etemad" href=""
<link rel="author" title="Chris Rebert" href=""
<link rel="help" href=""
<link rel="help" href=""
<link rel="match" href=""
<meta name="flags" content="">
- <meta name="assert" content="The 'direction' property should not be included in the properties that the 'all' shorthand is expanded to.">
+ <meta name="assert" content="Test passes if 'all' resets properties other than 'direction' and 'unicode-bidi'.">
<style>
-.outer {
- direction: rtl;/* should not get overridden by 'all' */
- all: initial;/* if incorrectly implemented, this causes direction:initial; which is the same as direction:ltr; */
- /* need these to trump 'all': */
- position: relative;
- display: block;
+.test {
+ /* these must not be overridden */
+ direction: rtl;
+ unicode-bidi: bidi-override;
}
-.square {
- width: 100px;
- height: 100px;
+
+.test, bdo {
+ /* all of these must be overridden */
+ border: solid red;
+ background: red;
+ color: red;
+ text-decoration: line-through;
+ font: bold italic small-caps 20px monospace;
+ outline: solid red;
+ float: left;
+ letter-spacing: 1em;
+ display: list-item;
+ text-align: center;
+ width: 0.5em;
+ margin: 10em;
+ overflow: scroll;
}
-.green {
- background-color: green;
+
+.test, bdo {
+ all: initial;
+ /* if incorrectly implemented, this causes direction: initial; unicode-bidi: initial;
+ which is the same as direction:ltr; unicode-bidi: normal */
}
-.above-right {
- position: absolute;
- right: 0;
-}
-.red {
- background-color: red;
-}
</style>
</head>
<body>
- <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+ <p>Test passes if the digits are <strong>in order</strong> and there is <strong>no red</strong>.</p>
- <div class="outer">
- <div class="square green above-right"></div>
- <div class="square red"></div>
- </div>
+ <div class="test"><bdo dir=rtl>987 <span>654</span></bdo> 321</div>
</body>
</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited-expected.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited-expected.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<title>CSS Cascade: all:revert in :visited</title>
+<a href="" passes if this text has UA style for visited links</a>
\ No newline at end of file
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS Cascade: all:revert in :visited</title>
+<link rel="help" href=""
+<link rel="match" href=""
+<style>
+ :root { color: red; }
+ a:visited { color: red; }
+ a:visited { all: revert; }
+</style>
+<a href="" passes if this text has UA style for visited links</a>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited-expected.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited-expected.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<title>CSS Cascade: all:unset in :visited</title>
+<style>
+ :root { color: green; }
+ a:visited { color: red; }
+ a:visited { color: unset; }
+</style>
+<a href="" passes if this text is green.</a>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS Cascade: all:unset in :visited</title>
+<link rel="help" href=""
+<link rel="match" href=""
+<style>
+ :root { color: green; }
+ a:visited { color: red; }
+ a:visited { all: unset; }
+</style>
+<a href="" passes if this text is green.</a>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001-expected.xht (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001-expected.xht (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001-expected.xht 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Reftest Reference</title>
+ <link rel="author" title="Gérard Talbot" href="" />
+ <style type="text/css"><![CDATA[
+ div
+ {
+ background-color: green;
+ height: 100px;
+ width: 100px;
+ }
+ ]]></style>
+ </head>
+ <body>
+ <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+ <div></div>
+ </body>
+</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>CSS Cascade: @import with basic media query</title>
+ <link rel="author" title="Elika J. Etemad" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <link rel="match" href=""
+ <meta name="assert" content="Test passes on visual UAs if @import can be combined with a media query.">
+ <style>
+ @import "support/test-red.css";
+ @import "support/test-green.css"
+ (min-width: 1px) and /* assuming screen < 1km */ (max-width: 40000in), nonsense;
+ @import "support/test-red.css"
+ (max-width: 1px), nonsense;
+ div {
+ width: 100px;
+ height: 100px;
+ background: red;
+ }
+ </style>
+</head>
+<body>
+ <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+ <div class="test">FAIL</div>
+</body>
+</html>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/important-prop.html (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/important-prop.html 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/important-prop.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -2,24 +2,32 @@
<html>
<head>
<meta charset="utf-8">
- <title>CSS Cascade: Important</title>
+ <title>CSS Cascade: Important vs. Animations</title>
<link rel="author" title="David Burns" href=""
+ <link rel="author" title="Elika J. Etemad" href=""
<link rel="help" href=""
<link rel="match" href=""
+ <meta name="assert" content="Test passes if normal rules are overridden by animations, important rules override animations, and !important declarations are ignored in animations.">
<meta name="flags" content="">
<style>
- @keyframes override{
- from, to{background-color: #f00;}
+ @keyframes override {
+ from, to {
+ background: #f00; color: green;
+ border-color: green; border-color: red !important;
+ }
}
.square {
color:#00f;
animation: override 1s infinite;
- width: 100px;
- height: 100px;
+ width: 80px;
+ height: 80px;
+ border: 10px solid red;
+ text-align: center;
}
- .green {
+ div {
background-color:green !important;
+ color: red;
}
</style>
</head>
@@ -26,7 +34,7 @@
<body>
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
- <div class="square green"></div>
+ <div class="square green">FAIL</div>
</body>
</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color-expected.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color-expected.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1 @@
+<html style="background: green"></html>
\ No newline at end of file
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>
+ CSS Cascading and Inheritance Test:
+ Initial property and background-color
+ </title>
+ <meta name="assert" content="
+ The initial keyword is supported on background-color.
+ " />
+
+ <link
+ rel="author"
+ title="François REMY"
+ href=""
+ / >
+
+ <link rel="help" href=""
+
+ <link
+ rel="match"
+ href=""
+ />
+
+ <style type="text/css">
+
+ html, body { margin: 0px; padding: 0px; }
+
+ html { background: green; overflow: hidden; }
+ #outer { position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; }
+ #outer { background: red; background-color: initial; }
+
+ </style>
+
+</head>
+<body>
+
+ <div id="outer"></div>
+
+</body>
+</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-green.css (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-green.css (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-green.css 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,4 @@
+.test {
+ background: green;
+ color: green;
+}
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-red.css (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-red.css (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-red.css 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,4 @@
+.test {
+ background: red;
+ color: red;
+}
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/w3c-import.log (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/w3c-import.log (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/w3c-import.log 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,18 @@
+The tests in this directory were imported from the W3C repository.
+Do NOT modify these tests directly in WebKit.
+Instead, create a pull request on the WPT github:
+ https://github.com/web-platform-tests/wpt
+
+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
+
+Do NOT modify or remove this file.
+
+------------------------------------------------------------------------
+Properties requiring vendor prefixes:
+None
+Property values requiring vendor prefixes:
+None
+------------------------------------------------------------------------
+List of files:
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-green.css
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/support/test-red.css
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-001.html (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-001.html 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-001.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>CSS Cascade: the "unset" value</title>
<link rel="author" title="Chris Rebert" href=""
+ <link rel="author" title="Elika J. Etemad" href=""
<link rel="help" href=""
<link rel="help" href=""
<link rel="match" href=""
@@ -16,15 +17,17 @@
}
.under {
background-color: green;
+ margin-bottom: -100px;
}
.outer {
color: green;
+ background: red;
}
.inner {
- position: absolute;
color: red;
background-color: red;
font-size: 40px;
+ text-align: center;
}
.inner {
color: unset;/* inherit from .outer */
@@ -35,9 +38,9 @@
<body>
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
- <div class="outer">
- <div class="inner square">WW</div>
+ <div class="outer square">
<div class="under square"></div>
+ <div class="inner square">XX</div>
</div>
</body>
</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage-expected.txt (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage-expected.txt 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,3 @@
+
+PASS Storage of "unset" value
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage.html (0 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage.html 2021-05-06 09:17:02 UTC (rev 277076)
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Storage of "unset" value</title>
+<meta name="author" title="Xidorn Quan" href=""
+<link rel="help" href=""
+<script src=""
+<script src=""
+<style>
+ div {
+ color: unset;
+ border: unset;
+ }
+</style>
+<body>
+ <div id="log"></div>
+ <script>
+ test(function() {
+ let properties = ["color", "border", "border-left", "border-color", "border-right-style"];
+ let style = document.styleSheets[0].cssRules[0].style;
+ for (let prop of properties) {
+ assert_equals(style.getPropertyValue(prop), "unset", `${prop} is expected to be "unset"`);
+ }
+ });
+ </script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/w3c-import.log (277075 => 277076)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/w3c-import.log 2021-05-06 08:52:52 UTC (rev 277075)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/w3c-import.log 2021-05-06 09:17:02 UTC (rev 277076)
@@ -28,11 +28,19 @@
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-color-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-color.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited-expected.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-visited.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-color-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-color.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited-expected.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-unset-visited.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001-expected.xht
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-conditional-001.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/important-prop-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/important-prop.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/inherit-initial.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color-expected.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-background-color.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-color-background-001-expected.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/initial-color-background-001.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/revert-val-001-expected.xht
@@ -51,3 +59,4 @@
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-001.html
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-002-expected.xht
/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-val-002.html
+/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/unset-value-storage.html
