Skip to content
Permalink
Browse files
Clean up some fast/text layout tests
https://bugs.webkit.org/show_bug.cgi?id=240738

Reviewed by Myles C. Maxfield.

Move Ahem-COLR.ttf from fast/text/canvas-color-fonts/resources to fast/text/resources
so a future non-canvas test can use it.

Create a fast/text/glyph-display-lists directory to host more future glyph
display list tests.

Remove platform/ios/fast/text/softHyphen-expected.txt because the test is a ref test.

* LayoutTests/TestExpectations:
* LayoutTests/fast/text/canvas-color-fonts/COLR-expected.html:
* LayoutTests/fast/text/canvas-color-fonts/COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/ctm-COLR-expected.html:
* LayoutTests/fast/text/canvas-color-fonts/ctm-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-color-COLR-expected.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-color-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-color-shadow-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-color-shadow-ctm-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-gradient-COLR-2.html:
* LayoutTests/fast/text/canvas-color-fonts/fill-gradient-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/linedash-COLR-expected-mismatch.html:
* LayoutTests/fast/text/canvas-color-fonts/linedash-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/linedash-outlines-expected-mismatch.html:
* LayoutTests/fast/text/canvas-color-fonts/linedash-outlines.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-color-COLR-expected.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-color-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-color-shadow-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-color-shadow-ctm-COLR.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-gradient-COLR-2.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-gradient-COLR-3.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-gradient-COLR-4.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-gradient-COLR-5.html:
* LayoutTests/fast/text/canvas-color-fonts/stroke-gradient-COLR.html:
* LayoutTests/fast/text/glyph-display-lists/glyph-display-list-color-expected.txt: Renamed from LayoutTests/fast/text/glyph-display-list-color-expected.txt.
* LayoutTests/fast/text/glyph-display-lists/glyph-display-list-color.html: Renamed from LayoutTests/fast/text/glyph-display-list-color.html.
* LayoutTests/fast/text/resources/Ahem-COLR.ttf: Renamed from LayoutTests/fast/text/canvas-color-fonts/resources/Ahem-COLR.ttf.
* LayoutTests/platform/ios/fast/text/softHyphen-expected.txt: Removed.

Canonical link: https://commits.webkit.org/250820@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
smfr committed May 20, 2022
1 parent c2855b1 commit b832db45c8bed5b620997ac33e270aa32979ca10
Showing 28 changed files with 24 additions and 192 deletions.
@@ -5104,7 +5104,7 @@ imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-csp.html
imported/w3c/web-platform-tests/workers/shared-worker-name-via-options.html [ DumpJSConsoleLogInStdErr Failure Pass ]

# Display list logging is only available in debug
[ Release ] fast/text/glyph-display-list-color.html [ Skip ]
[ Release ] fast/text/glyph-display-lists [ Skip ]

# Plugins
# FIXME: Remove these tests.
@@ -4,7 +4,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}

body {
@@ -4,7 +4,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>
@@ -5,7 +5,7 @@
<style>
@font-face {
font-family: "WebFont";
src: url("resources/Ahem-COLR.ttf") format("truetype");
src: url("../resources/Ahem-COLR.ttf") format("truetype");
}
</style>
</head>

This file was deleted.

0 comments on commit b832db4

Please sign in to comment.