Fix font paths after web-platform-tests#9718

My fixup broke these and I didn't notice, le sigh.
gsnedders · Mar 7, 2018 · a51b988 · a51b988
1 parent e45d0cf
commit a51b988
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/preload/download-resources.html b/preload/download-resources.html
@@ -8,7 +8,7 @@
 <link rel=preload href="resources/dummy.js" as=script>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -22,7 +22,7 @@
         verifyPreloadAndRTSupport()
         verifyNumberOfDownloads("resources/dummy.js", 1);
         verifyNumberOfDownloads("resources/dummy.css", 1);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 1);
         verifyNumberOfDownloads("resources/white.mp4", 1);
         verifyNumberOfDownloads("resources/sound_5.oga", 1);
         verifyNumberOfDownloads("resources/foo.vtt", 1);

diff --git a/preload/link-header-on-subresource.html b/preload/link-header-on-subresource.html
@@ -10,7 +10,7 @@
 <script>
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport();
-        verifyNumberOfDownloads("/preload/resources/CanvasTest.ttf?link-header-on-subresource", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf?link-header-on-subresource", 1);
         t.done();
     }));
 </script>

diff --git a/preload/onload-event.html b/preload/onload-event.html
@@ -19,7 +19,7 @@
 <link rel=preload href="resources/dummy.js" as=script onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
 <link rel=preload href="resources/white.mp4" as=video onload="videoLoaded = true;">
 <link rel=preload href="resources/sound_5.oga" as=audio onload="audioLoaded = true;">
 <link rel=preload href="resources/foo.vtt" as=track onload="trackLoaded = true;">

diff --git a/preload/preload-csp.sub.html b/preload/preload-csp.sub.html
@@ -9,7 +9,7 @@
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -23,7 +23,7 @@
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);

diff --git a/preload/preload-default-csp.sub.html b/preload/preload-default-csp.sub.html
@@ -9,7 +9,7 @@
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
@@ -23,7 +23,7 @@
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);

diff --git a/preload/preload-with-type.html b/preload/preload-with-type.html
@@ -31,7 +31,7 @@
 <link rel=preload href="resources/dummy.js" as=script type="text/javascript" onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style type="text/css" onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image type="image/png" onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/' + videoFormat + '" onload="videoLoaded = true;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/' + audioFormat + '" onload="audioLoaded = true;">');
@@ -40,7 +40,7 @@
 <link rel=preload href="resources/dummy.js" as=script type="application/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/dummy.css" as=style type="text/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/square.png" as=image type="image/foobar" onload="gibberishLoaded++;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/foobar" onload="gibberishLoaded++;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/foobar" onload="gibberishLoaded++;">');

diff --git a/preload/resources/dummy-preloads-subresource.css.sub.headers b/preload/resources/dummy-preloads-subresource.css.sub.headers
@@ -1,2 +1,2 @@
 Cache-Control: max-age=1000
-Link: </preload/resources/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
+Link: </fonts/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
diff --git a/preload/single-download-preload.html b/preload/single-download-preload.html
@@ -9,7 +9,7 @@
 <link rel=preload href="resources/dummy.css?single-download-preload" as=style>
 <link rel=preload href="resources/square.png?single-download-preload" as=image>
 <link rel=preload href="resources/square.png?background&single-download-preload" as=image>
-<link rel=preload href="resources/CanvasTest.ttf?single-download-preload" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf?single-download-preload" as=font crossorigin>
 <link rel=preload href="resources/white.mp4?single-download-preload" as=video>
 <link rel=preload href="resources/sound_5.oga?single-download-preload" as=audio>
 <link rel=preload href="resources/foo.vtt?single-download-preload" as=track>
@@ -25,7 +25,7 @@
     }
     @font-face {
       font-family:ahem;
-      src: url(resources/CanvasTest.ttf?single-download-preload);
+      src: url(/fonts/CanvasTest.ttf?single-download-preload);
     }
     span { font-family: ahem, Arial; }
 </style>
@@ -49,7 +49,7 @@
             verifyNumberOfDownloads("resources/dummy.css?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?background&single-download-preload", 1);
-            verifyNumberOfDownloads("resources/CanvasTest.ttf?single-download-preload", 1);
+            verifyNumberOfDownloads("/fonts/CanvasTest.ttf?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?foobar", 0);
             verifyNumberOfDownloads("resources/foo.vtt?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?single-download-preload", 1);