Skip to content

Commit e5474e0

Browse files
foolipgsnedders
authored andcommitted
Remove dupe media/CanvasTest.ttf and unused fonts/CanvasTest.sfd (#5678)
Most tests that use either already use fonts/CanvasTest.ttf No tests at all use fonts/CanvasTest.sdf
1 parent f7008c9 commit e5474e0

File tree

6 files changed

+8
-329
lines changed

6 files changed

+8
-329
lines changed

fonts/CanvasTest.sfd

Lines changed: 0 additions & 321 deletions
This file was deleted.

media/CanvasTest.ttf

-2.47 KB
Binary file not shown.

preload/download-resources.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link rel=preload href="resources/dummy.js" as=script>
99
<link rel=preload href="resources/dummy.css" as=style>
1010
<link rel=preload href="resources/square.png" as=image>
11-
<link rel=preload href="/media/CanvasTest.ttf" as=font crossorigin>
11+
<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
1212
<link rel=preload href="/media/white.mp4" as=video>
1313
<link rel=preload href="/media/sound_5.oga" as=audio>
1414
<link rel=preload href="/media/foo.vtt" as=track>
@@ -21,7 +21,7 @@
2121
verifyPreloadAndRTSupport()
2222
verifyNumberOfDownloads("resources/dummy.js", 1);
2323
verifyNumberOfDownloads("resources/dummy.css", 1);
24-
verifyNumberOfDownloads("/media/CanvasTest.ttf", 1);
24+
verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 1);
2525
verifyNumberOfDownloads("/media/white.mp4", 1);
2626
verifyNumberOfDownloads("/media/sound_5.oga", 1);
2727
verifyNumberOfDownloads("/media/foo.vtt", 1);

preload/onload-event.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<link rel=preload href="resources/dummy.js" as=script onload="scriptLoaded = true;">
1919
<link rel=preload href="resources/dummy.css" as=style onload="styleLoaded = true;">
2020
<link rel=preload href="resources/square.png" as=image onload="imageLoaded = true;">
21-
<link rel=preload href="/media/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
21+
<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
2222
<link rel=preload href="/media/white.mp4" as=video onload="videoLoaded = true;">
2323
<link rel=preload href="/media/sound_5.oga" as=audio onload="audioLoaded = true;">
2424
<link rel=preload href="/media/foo.vtt" as=track onload="trackLoaded = true;">

preload/preload-with-type.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<link rel=preload href="resources/dummy.js" as=script type="text/javascript" onload="scriptLoaded = true;">
3232
<link rel=preload href="resources/dummy.css" as=style type="text/css" onload="styleLoaded = true;">
3333
<link rel=preload href="resources/square.png" as=image type="image/png" onload="imageLoaded = true;">
34-
<link rel=preload href="/media/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
34+
<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
3535
<script>
3636
document.write('<link rel=preload href="' + videoURL + '" as=video type="video/' + videoFormat + '" onload="videoLoaded = true;">');
3737
document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/' + audioFormat + '" onload="audioLoaded = true;">');
@@ -40,7 +40,7 @@
4040
<link rel=preload href="resources/dummy.js" as=script type="application/foobar" onload="gibberishLoaded++;">
4141
<link rel=preload href="resources/dummy.css" as=style type="text/foobar" onload="gibberishLoaded++;">
4242
<link rel=preload href="resources/square.png" as=image type="image/foobar" onload="gibberishLoaded++;">
43-
<link rel=preload href="/media/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
43+
<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
4444
<script>
4545
document.write('<link rel=preload href="' + videoURL + '" as=video type="video/foobar" onload="gibberishLoaded++;">');
4646
document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/foobar" onload="gibberishLoaded++;">');

preload/single-download-preload.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel=preload href="resources/dummy.css" as=style>
1010
<link rel=preload href="resources/square.png" as=image>
1111
<link rel=preload href="resources/square.png?background" as=image>
12-
<link rel=preload href="/media/CanvasTest.ttf" as=font crossorigin>
12+
<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
1313
<link rel=preload href="/media/white.mp4" as=video>
1414
<link rel=preload href="/media/sound_5.oga" as=audio>
1515
<link rel=preload href="/media/foo.vtt" as=track>
@@ -25,7 +25,7 @@
2525
}
2626
@font-face {
2727
font-family:ahem;
28-
src: url(/media/CanvasTest.ttf);
28+
src: url(/fonts/CanvasTest.ttf);
2929
}
3030
span { font-family: ahem, Arial; }
3131
</style>
@@ -49,7 +49,7 @@
4949
verifyNumberOfDownloads("resources/dummy.css", 1);
5050
verifyNumberOfDownloads("resources/square.png", 1);
5151
verifyNumberOfDownloads("resources/square.png?background", 1);
52-
verifyNumberOfDownloads("/media/CanvasTest.ttf", 1);
52+
verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 1);
5353
verifyNumberOfDownloads("resources/dummy.xml?foobar", 0);
5454
verifyNumberOfDownloads("/media/foo.vtt", 1);
5555
verifyNumberOfDownloads("resources/dummy.xml", 1);

0 commit comments

Comments
 (0)