diff options
| author | ksakamoto <ksakamoto@chromium.org> | 2015-10-30 01:20:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-30 08:21:26 +0000 |
| commit | 5d305ecd0dfd22dc07edd801d7c010d7325645e8 (patch) | |
| tree | d5542d0894de2c5e3e73a60ce2266b642f82c040 | |
| parent | e8cc107c99f8dea17c02c677270e4e8af3f943c7 (diff) | |
| download | chromium_src-5d305ecd0dfd22dc07edd801d7c010d7325645e8.zip chromium_src-5d305ecd0dfd22dc07edd801d7c010d7325645e8.tar.gz chromium_src-5d305ecd0dfd22dc07edd801d7c010d7325645e8.tar.bz2 | |
Fix corrupted LayoutTests/http/tests/resources/Ahem.ttf
Copied correct file from LayoutTests/resources/Ahem.ttf.
Also, updated http tests to use the fixed one.
BUG=548543
Review URL: https://codereview.chromium.org/1417943005
Cr-Commit-Position: refs/heads/master@{#357053}
6 files changed, 6 insertions, 6 deletions
diff --git a/third_party/WebKit/LayoutTests/http/tests/css/resources/cors-ahem.php b/third_party/WebKit/LayoutTests/http/tests/css/resources/cors-ahem.php index a18850e..327fc32 100644 --- a/third_party/WebKit/LayoutTests/http/tests/css/resources/cors-ahem.php +++ b/third_party/WebKit/LayoutTests/http/tests/css/resources/cors-ahem.php @@ -3,7 +3,7 @@ if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) { header("HTTP/1.1 304 Not Modified"); } else { - $font = "../../../../resources/Ahem.ttf"; + $font = "../../resources/Ahem.ttf"; header("Cache-Control: public, max-age=86400"); header('Last-Modified: ' . gmdate("D, d M Y H:i:s", filemtime($font)) . " GMT"); diff --git a/third_party/WebKit/LayoutTests/http/tests/css/resources/referrer-check.php b/third_party/WebKit/LayoutTests/http/tests/css/resources/referrer-check.php index 2e8b00b..69483e0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/css/resources/referrer-check.php +++ b/third_party/WebKit/LayoutTests/http/tests/css/resources/referrer-check.php @@ -18,7 +18,7 @@ function putImage() { } function putFont() { - $font = "../../../../resources/Ahem.ttf"; + $font = "../../resources/Ahem.ttf"; header("Content-Type: font/truetype"); header("Content-Length: " . filesize($font)); header("Access-Control-Allow-Origin: *"); @@ -49,4 +49,4 @@ if ($referrerPath === $expectedReferrerPaths[$from]) { header("HTTP/1.1 500 Internal Server Error"); } -?>
\ No newline at end of file +?> diff --git a/third_party/WebKit/LayoutTests/http/tests/resources/Ahem.ttf b/third_party/WebKit/LayoutTests/http/tests/resources/Ahem.ttf Binary files differindex 09c019b..ac81cb0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/resources/Ahem.ttf +++ b/third_party/WebKit/LayoutTests/http/tests/resources/Ahem.ttf diff --git a/third_party/WebKit/LayoutTests/http/tests/security/resources/cors-font.php b/third_party/WebKit/LayoutTests/http/tests/security/resources/cors-font.php index d0663bf..21c7050 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/resources/cors-font.php +++ b/third_party/WebKit/LayoutTests/http/tests/security/resources/cors-font.php @@ -1,6 +1,6 @@ <?php -$font = "../../../../resources/Ahem.ttf"; +$font = "../../resources/Ahem.ttf"; header("Cache-Control: public, max-age=86400"); header('Last-Modified: ' . gmdate("D, d M Y H:i:s", filemtime($font)) . " GMT"); diff --git a/third_party/WebKit/LayoutTests/http/tests/webfont/resources/cookie-match.php b/third_party/WebKit/LayoutTests/http/tests/webfont/resources/cookie-match.php index fb9b315..025a70b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/webfont/resources/cookie-match.php +++ b/third_party/WebKit/LayoutTests/http/tests/webfont/resources/cookie-match.php @@ -6,7 +6,7 @@ if (!isset($_COOKIE["key"])) { } if ($_GET["key"] == $_COOKIE["key"]) { - $fp = fopen("../../../../resources/Ahem.ttf", "rb"); + $fp = fopen("../../resources/Ahem.ttf", "rb"); header("Content-type: application/octet-stream"); header("HTTP/1.0 200 OK"); fpassthru($fp); diff --git a/third_party/WebKit/LayoutTests/http/tests/webfont/slow-ahem-loading.cgi b/third_party/WebKit/LayoutTests/http/tests/webfont/slow-ahem-loading.cgi index a6f35d1..f62e4c4 100755 --- a/third_party/WebKit/LayoutTests/http/tests/webfont/slow-ahem-loading.cgi +++ b/third_party/WebKit/LayoutTests/http/tests/webfont/slow-ahem-loading.cgi @@ -9,6 +9,6 @@ $delay = 1000 unless $delay; print "Content-type: application/octet-stream\n"; print "Cache-control: no-cache, no-store\n\n"; Time::HiRes::sleep($delay / 1000); -open FH, "<../../../resources/Ahem.ttf" or die; +open FH, "<../resources/Ahem.ttf" or die; while (<FH>) { print; } close FH; |