Attachment 358695 Details for Bug 193273 – Patch

[patch] Patch

bug-193273-20190109211005.patch (text/plain), 79.02 KB, created by cathiechen on 2019-01-09 05:10:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: cathiechen

Created: 2019-01-09 05:10:06 PST

Size: 79.02 KB

patch

obsolete

>Subversion Revision: 239723
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 763ea36bc98be0d74c0e89316b200867f5348ec5..dbb6a7723d01cca21b0303d7f965c4576cc9224c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-09  cathie chen  <cathiechen@igalia.com>
>+
>+        Import css-lists testcases from WPT.
>+        https://bugs.webkit.org/show_bug.cgi?id=193273
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestExpectations:
>+        * platform/ios-simulator-wk2/TestExpectations:
>+
> 2019-01-07  Youenn Fablet  <youenn@apple.com>
> 
>         LayoutTests/http/wpt/fetch/csp-reports-bypass-csp-checks.html is flaky
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 0a501ef3c8756d9b6708960b952a5c700a0c3b07..400665b50943e958510ef883610034e9803fa4e0 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,76 @@
>+2019-01-09  cathie chen  <cathiechen@igalia.com>
>+
>+        Import css-lists testcases from WPT.
>+        https://bugs.webkit.org/show_bug.cgi?id=193273
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * resources/import-expectations.json:
>+        * resources/resource-files.json:
>+        * web-platform-tests/css/css-lists/META.yml: Added.
>+        * web-platform-tests/css/css-lists/add-inline-child-after-marker-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-square-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-expected.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html: Added.
>+        * web-platform-tests/css/css-lists/content-property/w3c-import.log: Added.
>+        * web-platform-tests/css/css-lists/counter-increment-inside-display-contents-expected.html: Added.
>+        * web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html: Added.
>+        * web-platform-tests/css/css-lists/counter-invalid-expected.html: Added.
>+        * web-platform-tests/css/css-lists/counter-invalid.htm: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-increment-display-contents-expected.html: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-increment-display-none-expected.html: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-increment-display-none.html: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-inside-display-contents-expected.html: Added.
>+        * web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html: Added.
>+        * web-platform-tests/css/css-lists/inheritance-expected.txt: Added.
>+        * web-platform-tests/css/css-lists/inheritance.html: Added.
>+        * web-platform-tests/css/css-lists/li-with-height-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/li-with-height-001.html: Added.
>+        * web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-block-textarea-001-expected.txt: Added.
>+        * web-platform-tests/css/css-lists/list-and-block-textarea-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-flex-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-flex-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-grid-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-grid-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-margin-collapse-001-expected.txt: Added.
>+        * web-platform-tests/css/css-lists/list-and-margin-collapse-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-and-writing-mode-001-expected.txt: Added.
>+        * web-platform-tests/css/css-lists/list-and-writing-mode-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html: Added.
>+        * web-platform-tests/css/css-lists/list-style-type-armenian-002.xht: Added.
>+        * web-platform-tests/css/css-lists/list-style-type-armenian-003.xht: Added.
>+        * web-platform-tests/css/css-lists/list-with-image-display-changed-001-expected.html: Added.
>+        * web-platform-tests/css/css-lists/list-with-image-display-changed-001.html: Added.
>+        * web-platform-tests/css/css-lists/resources/w3c-import.log: Added.
>+        * web-platform-tests/css/css-lists/resources/white.gif: Added.
>+        * web-platform-tests/css/css-lists/w3c-import.log: Added.
>+
> 2019-01-07  Dean Jackson  <dino@apple.com>
> 
>         Turn on Pointer Events by default for iOS
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 644731888389b4fb46d6eb212010c54f6e0fb922..fcafcf51f3d5c5eb128ce0fa6339d60aedaf7290 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -2920,3 +2920,14 @@ webkit.org/b/190032 imported/w3c/web-platform-tests/css/css-scoping/keyframes-00
> fast/mediacapturefromelement/CanvasCaptureMediaStream-imagebitmaprenderingcontext.html [ Skip ]
> fast/mediacapturefromelement/CanvasCaptureMediaStream-framerate-0.html [ Skip ]
> fast/mediacapturefromelement/CanvasCaptureMediaStream-capture-out-of-DOM-element.html [ Skip ]
>+
>+# Import css-lists testcases
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html [ ImageOnlyFailure ]
>diff --git a/LayoutTests/imported/w3c/resources/import-expectations.json b/LayoutTests/imported/w3c/resources/import-expectations.json
>index 34ab4eef9f477924c49f2b3c082ee2d85cf999ca..995219326a93eec7b52b0578350d5c90fa98e5e7 100644
>--- a/LayoutTests/imported/w3c/resources/import-expectations.json
>+++ b/LayoutTests/imported/w3c/resources/import-expectations.json
>@@ -69,6 +69,7 @@
>     "web-platform-tests/css/css-grid": "import", 
>     "web-platform-tests/css/css-grid/grid-definition/": "import", 
>     "web-platform-tests/css/css-grid/layout-algorithm/": "import", 
>+    "web-platform-tests/css/css-lists/": "import", 
>     "web-platform-tests/css/css-logical": "import", 
>     "web-platform-tests/css/css-multicol": "import", 
>     "web-platform-tests/css/css-overscroll-behavior": "import", 
>@@ -355,4 +356,4 @@
>     "web-platform-tests/worklets": "skip", 
>     "web-platform-tests/x-frame-options": "skip", 
>     "web-platform-tests/xhr": "import"
>-}
>+}
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/resources/resource-files.json b/LayoutTests/imported/w3c/resources/resource-files.json
>index 0ef1a84e2c7f62c5c4835071065e06af46bb4c79..232467142d5013381c373f941a1c3693a6609579 100644
>--- a/LayoutTests/imported/w3c/resources/resource-files.json
>+++ b/LayoutTests/imported/w3c/resources/resource-files.json
>@@ -138,6 +138,8 @@
>         "web-platform-tests/css/css-grid-1/test-plan/index.html",
>         "web-platform-tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html",
>         "web-platform-tests/css/css-grid/test-plan/index.html",
>+        "web-platform-tests/css/css-lists/list-style-type-armenian-002.xht",
>+        "web-platform-tests/css/css-lists/list-style-type-armenian-003.xht",
>         "web-platform-tests/css/css-multicol/multicol-rule-large-002.xht",
>         "web-platform-tests/css/css-pseudo/placeholder-input-number-notref.html",
>         "web-platform-tests/css/css-shapes/test-plan/index.html",
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/META.yml b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/META.yml
>new file mode 100644
>index 0000000000000000000000000000000000000000..05e60af1d8a558ec87a6c6f8acdeecdc0c7bb78d
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/META.yml
>@@ -0,0 +1,3 @@
>+spec: https://drafts.csswg.org/css-lists/
>+suggested_reviewers:
>+  - tabatkins
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..0c1d2397d75c34f7238c65b8762d5d206c36bf73
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-expected.html
>@@ -0,0 +1,14 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: Add inline child after marker</title>
>+
>+<p>The test passes if you see the list marker followed by the text "inline" and "axxx" in a line below.</p>
>+
>+<ul>
>+  <li>
>+    <span>inline</span>
>+    <div style="overflow:hidden;">
>+      <span>a</span>xxx
>+    </div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..851604a74b169b6500c8bd693e9e58eefa3a4800
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html
>@@ -0,0 +1,26 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: Add inline child after marker</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="add-inline-child-after-marker-001-ref.html">
>+
>+
>+<p>The test passes if you see the list marker followed by the text "inline" and "axxx" in a line below.</p>
>+
>+<ul>
>+  <li id="liTarget">
>+    <div id="divTarget" style="overflow:hidden;">
>+      <span>a</span>xxx
>+    </div>
>+  </li>
>+</ul>
>+<script>
>+  document.body.offsetHeight;
>+  var new_span=document.createElement("span");
>+  var text_node=document.createTextNode("inline");
>+  new_span.appendChild(text_node);
>+
>+  var div_target=document.getElementById("divTarget");
>+  var li_target=document.getElementById("liTarget");
>+  li_target.insertBefore(new_span,div_target);
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..f21dfff69608a6a1201bd586c2a6e1e24d5fd915
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-expected.html
>@@ -0,0 +1,10 @@
>+<!doctype html>
>+<meta charset=utf8>
>+<title>Reference: Inside list marker and normal text render identically: armenian</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>Ô±. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..fd0df631149a740a201510f2edff405d28f41929
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: armenian</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-armenian-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: armenian inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..60a342f1a9d85142da3d17baed1d7aa7d5aec471
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-expected.html
>@@ -0,0 +1,12 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: circle</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+p::before {
>+    content: counter(test, circle);
>+}
>+</style>
>+<p> Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..138f73cc514a02274b08dc0636250950c5d58d6a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: circle</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-circle-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: circle inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8f97cc36a4fd3d9851520484c092da0dc56c6541
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: decimal</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>1. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..997801d569907e6ac57906947f5e5dbef25e42ab
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: decimal-leading-zero</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>01. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5044d4e68dd42586b4a9ada58b8af2c232400c4c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: decimal-leading-zero</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-decimal-leading-zero-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: decimal-leading-zero inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8c991bc3d6a9e5065586756154ef6022850842f2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: decimal</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-decimal-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: decimal inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e34a90099825bd6bee509a92d4cc88c7b2c4a6b2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-expected.html
>@@ -0,0 +1,12 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: disc</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+p::before {
>+    content: counter(test, disc);
>+}
>+</style>
>+<p> Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e2456cb8f34e6b9df0cf3b499c6088661e505384
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: disc</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-disc-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: disc inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c400acae5297bc5a72fea4d1790b4bea62af7701
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-expected.html
>@@ -0,0 +1,10 @@
>+<!doctype html>
>+<meta charset=utf8>
>+<title>Reference: Inside list marker and normal text render identically: georgian</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>á. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ef7615f6f521828d77d7664b14d14a16680d473b
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: georgian</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-georgian-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: georgian inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..f28db82b984e43bd6e5f35a2ea8ec5d802b3a375
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-expected.html
>@@ -0,0 +1,10 @@
>+<!doctype html>
>+<meta charset=utf8>
>+<title>Reference: Inside list marker and normal text render identically: lower-greek</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>Î±. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..96b5d811c26e6ca764269331420c2079924fa15f
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: lower-greek</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-lower-greek-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: lower-greek inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b86fe8ecf591fc13eb1489f261f492a0f13028d5
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: lower-latin</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>a. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..0f6f24238b860dd9f8c258829be168183b2e2a40
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: lower-latin</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-lower-latin-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: lower-latin inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..92dfa3d752fcbf77ea3074d11784cc1362a66def
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: lower-roman</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>i. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..db7301b3201b20d63f5c49ab2aecf475912677c2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: lower-roman</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-lower-roman-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: lower-roman inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..99b64a5424ead1f65bc81803b9e5f21fdbda20a9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-expected.html
>@@ -0,0 +1,12 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: square</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+p::before {
>+    content: counter(test, square);
>+}
>+</style>
>+<p> Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..9095017b2469dd1b4abdf0207846dc2292d59fbd
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: square</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-square-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: square inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..6cbb712e76ba15371d739ec33277e55d6ab0d1ef
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: upper-latin</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>A. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..903ef8f57dd879ab3fb03278d36867eba0a1ecd6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: upper-latin</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-upper-latin-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: upper-latin inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..6fca49f27c17117d8ecf0aa8609b84ad68f2aea3
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-expected.html
>@@ -0,0 +1,9 @@
>+<!doctype html>
>+<title>Reference: Inside list marker and normal text render identically: upper-roman</title>
>+<style>
>+* {
>+    margin: 0;
>+    padding: 0;
>+}
>+</style>
>+<p>I. Filler Text
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..69f34d7408348e1b5061a5a86e68d481860df814
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html
>@@ -0,0 +1,18 @@
>+<!doctype html>
>+<title>Inside list marker and normal text render identically: upper-roman</title>
>+<link rel=help href="https://drafts.csswg.org/css-lists-3/#content-property">
>+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=787382">
>+<link rel=match href="marker-text-matches-upper-roman-ref.html">
>+<style>
>+* {
>+    padding: 0;
>+    margin: 0;
>+}
>+ol {
>+    list-style: upper-roman inside;
>+}
>+</style>
>+
>+<ol>
>+  <li>Filler Text</li>
>+</ol>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/w3c-import.log
>new file mode 100644
>index 0000000000000000000000000000000000000000..386f4b546db64bda05a4138b3a92e7c0015c030c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/w3c-import.log
>@@ -0,0 +1,40 @@
>+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-lists/content-property/marker-text-matches-armenian-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d1b67228fb65c34a861c1c682f0e29583cbdfd9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents-expected.html
>@@ -0,0 +1,6 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Test Reference</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ebfe1774da6a32508796b3bc83f428d78d089aff
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html
>@@ -0,0 +1,20 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: counter-increment on child of display:contents</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
>+<link rel="match" href="counter-7-ref.html">
>+<style>
>+  .inc { counter-increment: x }
>+  .reset-6 { counter-reset: x 6 }
>+  .contents { display: contents }
>+  .result::before { content: counter(x) }
>+</style>
>+<p>You should see the number 7 below.</p>
>+<div>
>+  <span class="reset-6"></span>
>+  <span class="contents">
>+    <span class="inc"></span>
>+  </span>
>+  <span class="result"></span>
>+</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d1b67228fb65c34a861c1c682f0e29583cbdfd9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid-expected.html
>@@ -0,0 +1,6 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Test Reference</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid.htm b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid.htm
>new file mode 100644
>index 0000000000000000000000000000000000000000..938015937025272c14a52b5839d65784ccb757bc
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid.htm
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: </title>
>+<link rel="author" title="Anthony Ramine" href="mailto:n.oxyde@gmail.com">
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#counter-functions">
>+<link rel="match" href="counter-7-ref.html">
>+<style>
>+    div::after { content: " is not " counter(inherit) }
>+</style>
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d1b67228fb65c34a861c1c682f0e29583cbdfd9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents-expected.html
>@@ -0,0 +1,6 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Test Reference</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a59576b25345032b80580a64d4775969e824f999
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: counter-reset and counter-increment on display:contents</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
>+<link rel="match" href="counter-7-ref.html">
>+<style>
>+  .inc { counter-increment: x }
>+  .reset-6 { counter-reset: x 6 }
>+  .reset-666 { counter-reset: x 666 }
>+  .contents { display: contents }
>+  .result::before { content: counter(x) }
>+</style>
>+<p>You should see the number 7 below.</p>
>+<div>
>+  <span class="reset-6"></span>
>+  <span class="contents reset-666 inc"></span>
>+  <span class="inc result"></span>
>+</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d1b67228fb65c34a861c1c682f0e29583cbdfd9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none-expected.html
>@@ -0,0 +1,6 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Test Reference</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3b344a751c1da2d3c15feab1cdba078cc3c4590a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: counter-reset and counter-increment on display:none</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
>+<link rel="match" href="counter-7-ref.html">
>+<style>
>+  .inc { counter-increment: x }
>+  .reset-6 { counter-reset: x 6 }
>+  .reset-666 { counter-reset: x 666 }
>+  .none { display: none }
>+  .result::before { content: counter(x) }
>+</style>
>+<p>You should see the number 7 below.</p>
>+<div>
>+  <span class="reset-6"></span>
>+  <span class="none reset-666 inc"></span>
>+  <span class="inc result"></span>
>+</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d1b67228fb65c34a861c1c682f0e29583cbdfd9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents-expected.html
>@@ -0,0 +1,6 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Test Reference</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<p>You should see the number 7 below.</p>
>+<div>7</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..85c137e675e55a54c4ab3834469ab3d13aa32725
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: counter-reset on child of display:contents</title>
>+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
>+<link rel="match" href="counter-7-ref.html">
>+<style>
>+  .inc { counter-increment: x }
>+  .reset-6 { counter-reset: x 6 }
>+  .reset-666 { counter-reset: x 6 }
>+  .contents { display: contents }
>+  .result::before { content: counter(x) }
>+</style>
>+<p>You should see the number 7 below.</p>
>+<div>
>+  <span class="reset-6"></span>
>+  <span class="contents">
>+    <span class="reset-666"></span>
>+  </span>
>+  <span class="inc result"></span>
>+</div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..736cb41b371a00a4d9cb9feb9adba872f4598733
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance-expected.txt
>@@ -0,0 +1,13 @@
>+Blocked access to external URL https://example.com/
>+
>+PASS Property counter-increment has initial value none 
>+PASS Property counter-increment does not inherit 
>+PASS Property counter-reset has initial value none 
>+PASS Property counter-reset does not inherit 
>+PASS Property list-style-image has initial value none 
>+PASS Property list-style-image inherits 
>+PASS Property list-style-position has initial value outside 
>+PASS Property list-style-position inherits 
>+PASS Property list-style-type has initial value disc 
>+PASS Property list-style-type inherits 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b6095d223f37d19ef34ca41408d9feaa96059046
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance.html
>@@ -0,0 +1,25 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset="utf-8">
>+<title>Inheritance of CSS Lists properties</title>
>+<link rel="help" href="https://drafts.csswg.org/css-lists/#property-index">
>+<meta name="assert" content="Properties inherit or not according to the spec.">
>+<meta name="assert" content="Properties have initial values according to the spec.">
>+<script src="../../../../../resources/testharness.js"></script>
>+<script src="../../../../../resources/testharnessreport.js"></script>
>+<script src="/css/support/inheritance-testcommon.js"></script>
>+</head>
>+<body>
>+<div id="container">
>+  <div id="target"></div>
>+</div>
>+<script>
>+assert_not_inherited('counter-increment', 'none', 'foo 123');
>+assert_not_inherited('counter-reset', 'none', 'foo 123');
>+assert_inherited('list-style-image', 'none', 'url("https://example.com/")');
>+assert_inherited('list-style-position', 'outside', 'inside');
>+assert_inherited('list-style-type', 'disc', 'square');
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..486009d5604ab7a2cb66df735efff3c11c00b685
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001-expected.html
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: list with height</title>
>+
>+<p>The test passes if "second" is in the following line of "first".</p>
>+<ul>
>+  <li id="li_target" style="height:200px; border:1px solid black; width:200px">
>+    first<div id="div_target" style="overflow:hidden;">second</div>
>+  </li>
>+</ul>
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ad2ac65e179714dd5fb85de6b67a6f097823a507
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001.html
>@@ -0,0 +1,23 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: list with height</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="li-with-height-001-ref.html">
>+<meta name="assert" content="This is to check the behavior of adding an element at the begining of li" />
>+
>+<p>The test passes if "second" is in the following line of "first".</p>
>+
>+<ul>
>+  <li id="li_target" style="height:200px; border:1px solid black; width:200px">
>+    <div id="div_target" style="overflow:hidden;">second</div>
>+  </li>
>+</ul>
>+
>+<script>
>+  document.body.clientHeight;
>+
>+  var text_node = document.createTextNode("first");
>+  var li_target = document.getElementById("li_target");
>+  var div_target = document.getElementById("div_target");
>+  li_target.insertBefore(text_node,div_target);
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a3ea8b66ee0d3bf329f2b03caf8ff8cab745216e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-expected.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test inside and outside switch</title>
>+
>+<p>The test passes if the first li is inside and the second one is outside.</p>
>+
>+<ul>
>+  <li style="list-style-position: inside;">
>+    <div style="overflow:hidden;">
>+      outside to inside
>+    </div>
>+  </li>
>+</ul>
>+
>+<ul>
>+  <li style="list-style-position: outside;">
>+    <div style="overflow:hidden;">
>+      inside to outside
>+    </div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e39ee9dc0307a370d0c8d7f458174c539dfea505
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html
>@@ -0,0 +1,36 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test inside and outside switch</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="li-with-overflow-hidden-change-list-style-position-001-ref.html">
>+
>+
>+<p>The test passes if the first li is inside and the second one is outside.</p>
>+
>+<ul>
>+  <li id="outSide" style="list-style-position: outside;">
>+    <div style="overflow:hidden;">
>+      outside to inside
>+    </div>
>+  </li>
>+</ul>
>+
>+<ul>
>+  <li id="inSide" style="list-style-position: inside;">
>+    <div style="overflow:hidden;">
>+      inside to outside
>+    </div>
>+  </li>
>+</ul>
>+<script>
>+  document.body.offsetHeight;
>+
>+  var outside_li=document.getElementById("outSide");
>+  outside_li.style.listStylePosition = "inside";
>+  document.body.offsetHeight;
>+
>+  var inside_li=document.getElementById("inSide");
>+  inside_li.style.listStylePosition = "outside";
>+  document.body.offsetHeight;
>+
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..40f210d9c8cb6d17c8ce44685d30bb3388e87b24
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS list and block textarea 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8a25697624abfd149acc04c81a4241c69241c7f8
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001.html
>@@ -0,0 +1,33 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with textarea as its first child</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+
>+
>+<script src="../../../../../resources/testharness.js"></script>
>+<script src="../../../../../resources/testharnessreport.js"></script>
>+
>+<style>
>+textarea {
>+  border: 0px;
>+  padding: 0px;
>+}
>+</style>
>+
>+<div id="log"></div>
>+
>+<ul>
>+  <li id="target">
>+    <textarea rows="3" cols="20" style="display:block; height:45px">
>+      hello
>+    </textarea>
>+  </li>
>+</ul>
>+
>+<script>
>+test(function() {
>+  var height = document.getElementById("target").offsetHeight;
>+  assert_equals(height, 45, "the height of li should be 45px, and no extra line generated")
>+}, "list and block textarea");
>+
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..d7be687125aad54054338694ae35866a94380251
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001-expected.html
>@@ -0,0 +1,15 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with flex as its first child</title>
>+
>+<p>There should be no extra line generated between the marker and the flex.</p>
>+
>+<ul>
>+  <li>
>+    <div style="border: 1px black solid;">
>+      <div style="display: inline-flex; align-items: flex-end; height: 200px;">
>+        <span style="line-height: 50px">text</span>
>+      </div>
>+    </div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..35e0d3f1797a659563315f09baf0888cf7a61222
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001.html
>@@ -0,0 +1,18 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with flex as its first child</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="list-and-flex-001-ref.html">
>+
>+
>+<p>There should be no extra line generated between the marker and the flex.</p>
>+
>+<ul>
>+  <li>
>+    <div style="border: 1px black solid;">
>+      <div style="display: flex; align-items: flex-end; height: 200px;">
>+        <span style="line-height: 50px">text</span>
>+      </div>
>+    </div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b6e777428df55c9a1c93e38c54dd748b7452ab41
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001-expected.html
>@@ -0,0 +1,14 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with grid as its first child</title>
>+
>+<p>There should be no extra line generated between the marker and the grid.</p>
>+
>+<ul>
>+  <li>
>+    <div style="display: inline-grid; grid-template-rows: 100px; align-items: center;">
>+      <div>grid</div>
>+    </div>
>+  </li>
>+</ul>
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..05b7ffca55b4654533208010fe481c49c1f0efef
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001.html
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with grid as its first child</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="list-and-grid-001-ref.html">
>+
>+
>+<p>There should be no extra line generated between the marker and the grid.</p>
>+
>+<ul>
>+  <li>
>+    <div style="display: grid; grid-template-rows: 100px; align-items: center;">
>+      <div>grid</div>
>+    </div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..713cfcd19ffdeb3a60851231ba3d7969490984a0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS list and margin collapse 
>+xxx
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c88989959052fc3387e75c11e57326c462ad2287
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html
>@@ -0,0 +1,23 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test the margin collapse of marker</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+
>+
>+<script src="../../../../../resources/testharness.js"></script>
>+<script src="../../../../../resources/testharnessreport.js"></script>
>+
>+<div id="log"></div>
>+
>+<ul id="target" style="margin-top:100px;">
>+  <li>
>+    <div style="overflow:hidden; margin-top:100px; height:25px;"><a href="#">xxx</a></div>
>+  </li>
>+</ul>
>+
>+<script>
>+test(function() {
>+  var height = document.getElementById("target").clientHeight;
>+  assert_equals(height, 25, "the height of ul should be 25px")
>+}, "list and margin collapse");
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b0f8963593353b623e19aafe56d8727422133c85
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL list and writing-mode assert_equals: the height of li should be 45px, and no extra line generated expected 45 but got 63
>+a b c
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..cc088289457df5db12a356e2238319cc70c4170f
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with root writing-mode as its first child</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+
>+
>+<script src="../../../../../resources/testharness.js"></script>
>+<script src="../../../../../resources/testharnessreport.js"></script>
>+
>+<div id="log"></div>
>+
>+<ul>
>+  <li id="target">
>+    <div style="writing-mode: vertical-lr; height: 45px;">a b c</div>
>+  </li>
>+</ul>
>+
>+<script>
>+test(function() {
>+  var height = document.getElementById("target").offsetHeight;
>+  assert_equals(height, 45, "the height of li should be 45px, and no extra line generated")
>+}, "list and writing-mode");
>+</script>
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ae6486147e28502db80f6b887b1a6b16c30184f2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-expected.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with overflow:hidden and line-height firstchild</title>
>+
>+<p>This test passes if there is a marker for each li and followed by "text" in the same line.</p>
>+
>+<ul>
>+  <li>
>+    <div style="line-height:100px;">
>+      <span>text</span>
>+    </div>
>+  </li>
>+</ul>
>+<ul>
>+  <li style="list-style-image: url(resources/white.gif);">
>+    <div style="line-height:100px;">text</div>
>+  </li>
>+</ul>
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c8bd56709ba4d85981d45db05a57df6c6676a4d0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with overflow:hidden and line-height firstchild</title>
>+<link rel=help href="https://www.w3.org/TR/CSS22/generate.html#lists">
>+<link rel=match href="list-marker-with-lineheight-and-overflow-hidden-001-ref.html">
>+
>+
>+<p>This test passes if there is a marker for each li and followed by "text" in the same line.</p>
>+
>+<ul>
>+  <li>
>+    <div style="overflow:hidden; line-height:100px;">
>+      <span>text</span>
>+    </div>
>+  </li>
>+</ul>
>+
>+<ul>
>+  <li style="list-style-image: url(resources/white.gif);">
>+    <div style="overflow:hidden; line-height:100px;">text</div>
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht
>new file mode 100644
>index 0000000000000000000000000000000000000000..fc7b71f841a4e20c3d2e15ea7c3ac4407e2ebe0a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht
>@@ -0,0 +1,103 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>+<html xmlns="http://www.w3.org/1999/xhtml">
>+<head>
>+<title>CSS Test: list-style-type - armenian, up to 9,999</title>
>+<link rel='author' title='Richard Ishida' href='http://rishida.net' />
>+<link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
>+<link rel='help' href='http://www.w3.org/TR/CSS21/generate.html#list-style' />
>+<link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-list-style-type/generate?test=2' />
>+<meta name='flags' content='' />
>+<meta name="assert" content="Setting list-style-type to armenian will cause list numbering to format numbers up to 9,999 in the way described in CSS3 Lists module." />
>+<style type='text/css'>
>+.armenian { list-style-type: armenian; }
>+
>+/* the CSS below is not part of the test */
>+.test { font-size: 24px; font-family: sans-serif; }
>+ol { margin: 0; padding-left: 8em; }
>+.alt { color: #ff6633; margin-left: 40px;}
>+
>+</style>
>+</head>
>+<body>
>+<p class="instructions">Test passes if the numbering matches the numbering in the two columns is the same.</p>
>+
>+
>+<div class="test">
>+			<ol class="armenian">
>+				<li title="1">Ô±</li>
>+				<li title="2">Ô²</li>
>+				<li title="3">Ô³</li>
>+				<li title="4">Ô´</li>
>+				<li title="5">Ôµ</li>
>+				<li title="6">Ô¶</li>
>+				<li title="7">Ô·</li>
>+				<li title="8">Ô¸</li>
>+				<li title="9">Ô¹</li>
>+				<li title="10">Ôº</li>
>+				<li title="11">ÔºÔ±</li>
>+				<li title="12">ÔºÔ²</li>
>+			</ol>
>+			<ol class="armenian" start="43">
>+				<li title="43">Ô½Ô³</li>
>+			</ol>
>+			<ol class="armenian" start="77">
>+				<li title="77">ÕÔ·</li>
>+			</ol>
>+			<ol class="armenian" start="80">
>+				<li title="80">Õ</li>
>+			</ol>
>+			<ol class="armenian" start="99">
>+				<li title="99">ÕÔ¹</li>
>+				<li title="100">Õ</li>
>+				<li title="101">ÕÔ±</li>
>+			</ol>
>+			<ol class="armenian" start="222">
>+				<li title="222">ÕÔ»Ô²</li>
>+			</ol>
>+			<ol class="armenian" start="540">
>+				<li title="540">ÕÔ½</li>
>+			</ol>
>+			<ol class="armenian" start="999">
>+				<li title="999">ÕÕÔ¹</li>
>+				<li title="1000">Õ</li>
>+			</ol>
>+			<ol class="armenian" start="1005">
>+				<li title="1005">ÕÔµ</li>
>+			</ol>
>+			<ol class="armenian" start="1060">
>+				<li title="1060">ÕÔ¿</li>
>+			</ol>
>+			<ol class="armenian" start="1065">
>+				<li title="1065">ÕÔ¿Ôµ</li>
>+			</ol>
>+			<ol class="armenian" start="1800">
>+				<li title="1800">ÕÕ</li>
>+			</ol>
>+			<ol class="armenian" start="1860">
>+				<li title="1860">ÕÕÔ¿</li>
>+			</ol>
>+			<ol class="armenian" start="1865">
>+				<li title="1865">ÕÕÔ¿Ôµ</li>
>+			</ol>
>+			<ol class="armenian" start="5865">
>+				<li title="5865">ÕÕÔ¿Ôµ</li>
>+			</ol>
>+			<ol class="armenian" start="7005">
>+				<li title="7005">ÕÕÔµ</li>
>+			</ol>
>+			<ol class="armenian" start="7800">
>+				<li title="7800">ÕÕÕ</li>
>+			</ol>
>+			<ol class="armenian" start="7865">
>+				<li title="7865">ÕÕÕÔ¿Ôµ</li>
>+			</ol>
>+			<ol class="armenian" start="9999">
>+				<li title="9999">ÕÕÕÔ¹</li>
>+			</ol>
>+		</div>
>+
>+
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht
>new file mode 100644
>index 0000000000000000000000000000000000000000..5a2de20c60028a00f6534711e3988bcdd47ad365
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht
>@@ -0,0 +1,42 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>+<html xmlns="http://www.w3.org/1999/xhtml">
>+<head>
>+<title>CSS Test: list-style-type - armenian, over 9,999</title>
>+<link rel='author' title='Richard Ishida' href='http://rishida.net' />
>+<link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
>+<link rel='help' href='http://www.w3.org/TR/CSS21/generate.html#list-style' />
>+<link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-list-style-type/generate?test=3' />
>+<meta name='flags' content='' />
>+<meta name="assert" content="Setting list-style-type to armenian will cause list numbering to format numbers above 9,999 in the way described in the CSS3 Lists module." />
>+<style type='text/css'>
>+.armenian { list-style-type: armenian; }
>+
>+/* the CSS below is not part of the test */
>+.test { font-size: 24px; font-family: sans-serif; }
>+ol { margin: 0; padding-left: 8em; }
>+.alt { color: #ff6633; margin-left: 40px;}
>+
>+</style>
>+</head>
>+<body>
>+<p class="instructions">Test passes if the numbering matches the numbering in the two columns is the same.</p>
>+
>+
>+<div class="test">
>+			<ol class="armenian" start="10000">
>+				<li title="10,000">Ô±Ì</li>
>+				<li title="10,001">Ô±ÌÔ±</li>
>+			</ol>
>+			<ol class="armenian" start="55465">
>+				<li title="55,465">ÔµÌÕÕÔ¿Ôµ</li>
>+			</ol>
>+			<ol class="armenian" start="655465">
>+				<li title="655,465">Ô¿ÌÔµÌÕÕÔ¿Ôµ</li>
>+			</ol>
>+		</div>
>+
>+
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..bfe0eb60f8dfbc30311fdec49490f7ecf2dc0b1c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001-expected.html
>@@ -0,0 +1,15 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with firstchild changing display</title>
>+
>+<style>
>+li { border: 3px solid black; margin: 3px; }
>+img { display: block; }
>+</style>
>+
>+<ul>
>+  <li>
>+    <a href="#"><img src="./resources/white.gif" width=32 height=32 /></a>
>+    Some other text
>+  </li>
>+</ul>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..1c562cf99f3a2e8f90a064df225ac3390cf0011b
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html
>@@ -0,0 +1,29 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>CSS Lists: test list with firstchild changing display</title>
>+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/2787">
>+<link rel=match href="list-with-image-display-changed-001-ref.html">
>+
>+<meta name="assert" content="
>+    After the display of img being changed from block to inline, then back to block,
>+    the final position of marker should be the same as the beginning." />
>+
>+<style>
>+li { border: 3px solid black; margin: 3px; }
>+img { display: block; }
>+</style>
>+
>+<ul>
>+  <li>
>+    <a href="#"><img src="./resources/white.gif" width=32 height=32 /></a>
>+    Some other text
>+  </li>
>+</ul>
>+<script>
>+  document.body.offsetTop;
>+  var img = document.querySelector('a img');
>+  img.style.display = 'inline';
>+  img.offsetWidth;
>+  img.style.display = 'block';
>+</script>
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/resources/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/resources/w3c-import.log
>new file mode 100644
>index 0000000000000000000000000000000000000000..510abbf40cfe24ea20ce6ea01f1e3f0d389b47e7
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/resources/w3c-import.log
>@@ -0,0 +1,17 @@
>+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-lists/resources/white.gif
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/resources/white.gif b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/resources/white.gif
>new file mode 100644
>index 0000000000000000000000000000000000000000..3aa2098dc8817f5360d13440f3d6245a030dc31d
>GIT binary patch
>literal 192
>zcmZ?wbhEHb<YM4rI3mpO|Ns9fQ>I+Ic5Tj_IcwLhegFP_a&oelmseC&)V+K6o<D!y
>z($dn?)3bH!*1dc8W@l#?7Z)EpcI@1_a}2}*#h)yU3=F~yIw0jBI~`bUADFlXX}UgA
>zvE?t?)5CS9;Q<e~)1?L>UX}I<4aJTjOi_(0k8d(@dpb>=U{b&qo50X25yu?J(&XT9
>JXtDr<H2`LOKV<*_
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/w3c-import.log
>new file mode 100644
>index 0000000000000000000000000000000000000000..269a0812a286493ec974789d2727a5ac668dedaf
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/w3c-import.log
>@@ -0,0 +1,47 @@
>+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-lists/META.yml
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-invalid.htm
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inheritance.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-height-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-block-textarea-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-flex-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-grid-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-and-writing-mode-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001-expected.html
>+/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html
>diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>index 433d7f8bffcb14763ef65cd73b01f14b0c416ca3..c625170106658292be8f7c25bef65c493e999865 100644
>--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>@@ -45,4 +45,7 @@ webkit.org/b/187699 [ Debug ] fast/forms/submit-change-fragment.html [ Pass Time
> 
> webkit.org/b/188017 [ Release ] media/audio-concurrent-supported.html [ Pass Failure ]
> 
>-
>+# Import css-lists testcases.
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html [ ImageOnlyFailure ]
>+imported/w3c/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html [ Pass ]

Actions: View | Formatted Diff | Diff

Attachments on bug 193273: 358677 | 358681 | 358684 | 358685 | 358687 | 358690 | 358694 | 358695 | 358698 | 358708 | 358716 | 358775 | 358781 | 358782