[Cocoa] fast/text/font-collection.html is failing
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 May 2020 16:42:58 +0000 (16:42 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 May 2020 16:42:58 +0000 (16:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=212172
<rdar://problem/63466187>

Unreviewed.

The test is failing because the collection font file placed one of its table
directories after the table data. This is a valid file, so this patch doesn't
delete the test, but it also duplicates the test with a new collection font
file that doesn't have this construction. The duplicate test should pass on
all OSes.

* fast/text/font-collection-2-expected.html: Copied from LayoutTests/fast/text/font-collection.html.
* fast/text/font-collection-2.html: Added. Add some extra characters just to
  make sure things are working properly.
* fast/text/font-collection-expected.html:
* fast/text/font-collection.html: Ditto.
* fast/text/resources/collection2.ttc: Added.
* platform/ios/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/text/font-collection-2-expected.html [new file with mode: 0644]
LayoutTests/fast/text/font-collection-2.html [new file with mode: 0644]
LayoutTests/fast/text/font-collection-expected.html
LayoutTests/fast/text/font-collection.html
LayoutTests/fast/text/resources/collection2.ttc [new file with mode: 0644]
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations

index b748de0..43690cd 100644 (file)
@@ -1,3 +1,27 @@
+2020-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] fast/text/font-collection.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=212172
+        <rdar://problem/63466187>
+
+        Unreviewed.
+
+        The test is failing because the collection font file placed one of its table
+        directories after the table data. This is a valid file, so this patch doesn't
+        delete the test, but it also duplicates the test with a new collection font
+        file that doesn't have this construction. The duplicate test should pass on
+        all OSes.
+
+        * fast/text/font-collection-2-expected.html: Copied from LayoutTests/fast/text/font-collection.html.
+        * fast/text/font-collection-2.html: Added. Add some extra characters just to
+          make sure things are working properly.
+        * fast/text/font-collection-expected.html:
+        * fast/text/font-collection.html: Ditto.
+        * fast/text/resources/collection2.ttc: Added.
+        * platform/ios/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+
 2020-05-22  Ryan Haddad  <ryanhaddad@apple.com>
 
         Cannot style ::selection for a flex container
diff --git a/LayoutTests/fast/text/font-collection-2-expected.html b/LayoutTests/fast/text/font-collection-2-expected.html
new file mode 100644 (file)
index 0000000..4176060
--- /dev/null
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+    font-family: "WebFont1";
+    src: url("../../resources/Ahem.ttf");
+}
+</style>
+</head>
+<body>
+This test makes sure that font collections work correctly. The font passes if you see a letter "A" followed by two squares below.
+<div style="-webkit-font-smoothing: none;">
+<div style="display: inline-block; width: 1px; height: 100px;"></div>
+<div style="display: inline-block; margin: 5px; font: 48px 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1';">B</div>
+</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/text/font-collection-2.html b/LayoutTests/fast/text/font-collection-2.html
new file mode 100644 (file)
index 0000000..d34e3df
--- /dev/null
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+    font-family: "WebFont1";
+    src: url("resources/collection2.ttc#Ahemerator");
+}
+@font-face {
+    font-family: "WebFont2";
+    src: url("resources/collection2.ttc#Ahem");
+}
+</style>
+</head>
+<body>
+This test makes sure that font collections work correctly. The font passes if you see a letter "A" followed by two squares below.
+<div style="-webkit-font-smoothing: none;">
+<div style="display: inline-block; width: 1px; height: 100px;"></div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1', 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont2', 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1', 'Helvetica';">B</div>
+</div>
+</body>
+</html>
index 69d48e2..4176060 100644 (file)
@@ -1,9 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
+<style>
+@font-face {
+    font-family: "WebFont1";
+    src: url("../../resources/Ahem.ttf");
+}
+</style>
 </head>
 <body>
-This test makes sure that font collections work correctly. The font passes if you see a letter "A" below.
-<div style="font: 48px 'Helvetica';">A</div>
+This test makes sure that font collections work correctly. The font passes if you see a letter "A" followed by two squares below.
+<div style="-webkit-font-smoothing: none;">
+<div style="display: inline-block; width: 1px; height: 100px;"></div>
+<div style="display: inline-block; margin: 5px; font: 48px 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1';">B</div>
+</div>
 </body>
 </html>
index 87b429e..90484bd 100644 (file)
 </style>
 </head>
 <body>
-This test makes sure that font collections work correctly. The font passes if you see a letter "A" below.
-<div style="font: 48px 'WebFont1', 'Helvetica';">A</div>
+This test makes sure that font collections work correctly. The font passes if you see a letter "A" followed by two squares below.
+<div style="-webkit-font-smoothing: none;">
+<div style="display: inline-block; width: 1px; height: 100px;"></div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1', 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont2', 'Helvetica';">A</div>
+<div style="display: inline-block; margin: 5px; font: 48px 'WebFont1', 'Helvetica';">B</div>
+</div>
 </body>
 </html>
diff --git a/LayoutTests/fast/text/resources/collection2.ttc b/LayoutTests/fast/text/resources/collection2.ttc
new file mode 100644 (file)
index 0000000..3f3ac17
Binary files /dev/null and b/LayoutTests/fast/text/resources/collection2.ttc differ
index 5712144..9caedb0 100644 (file)
@@ -3212,7 +3212,7 @@ fast/images/animated-heics-draw.html [ Pass ]
 fast/images/animated-heics-verify.html [ Pass ]
 
 # <rdar://problem/40172428> REGRESSION: LayoutTests fast/text/font-collection.html and fast/text/woff2.html are failing
-fast/text/font-collection.html [ ImageOnlyFailure ]
+webkit.org/b/212172 fast/text/font-collection.html [ ImageOnlyFailure ]
 
 # <rdar://problem/41546587> REGRESSION: LayoutTest compositing/contents-scale/non-decomposable-matrix.html is failing
 compositing/contents-scale/non-decomposable-matrix.html [ ImageOnlyFailure ]
index 463649d..dc9ae13 100644 (file)
@@ -1678,7 +1678,7 @@ webkit.org/b/190882 animations/change-one-anim.html [ Pass Failure ]
 [ Catalina+ ] fast/images/animated-heics-verify.html [ Pass ]
 
 # <rdar://problem/40172428>
-[ Catalina+ ] fast/text/font-collection.html [ ImageOnlyFailure ]
+webkit.org/b/212172 [ Catalina ] fast/text/font-collection.html [ ImageOnlyFailure ]
 [ Catalina+ ] fast/text/woff2.html [ Pass ImageOnlyFailure ]
 
 # <rdar://problem/45056204>
index 7eece1d..ae7e131 100644 (file)
@@ -4502,3 +4502,5 @@ fast/repaint/iframe-on-subpixel-position.html [ Skip ]
 # Windows can't seem to handle the fonts used in these tests.
 webkit.org/b/211860 fast/text/multiple-codeunit-vertical-upright.html [ Pass ImageOnlyFailure ]
 webkit.org/b/211860 fast/text/multiple-codeunit-vertical-upright-2.html [ Pass ImageOnlyFailure ]
+webkit.org/b/212172 fast/text/font-collection.html [ ImageOnlyFailure ]
+webkit.org/b/212172 fast/text/font-collection-2.html [ ImageOnlyFailure ]