summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.pngbin4657 -> 13189 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
3 files changed, 1 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.checksum
index 5a08df3..661a70d 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.checksum
@@ -1 +1 @@
-bcd314eda0cd8a24aac088b2904d7917 \ No newline at end of file
+6c2b752b4f774fe9bfab27d3cdb51db6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.png
index f8a6836..70eff25 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/font-face-default-font-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index aae5710..09eb359 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -866,12 +866,6 @@ BUG16779 WONTFIX SKIP : LayoutTests/media/video-size-intrinsic-scale.html = FAIL
// Function arguments object is copied for each access.
BUG24194 : LayoutTests/fast/js/kde/function_arguments.html = FAIL
-// It looks like the upstream test is incorrectly using font-family: Times
-// instead of font-family: times new roman. This broke when we recently moved
-// more of our font default settings to 'times new roman' from 'Times'. This
-// should be fixed upstream. https://bugs.webkit.org/show_bug.cgi?id=16348
-BUG10277 LINUX : LayoutTests/fast/css/font-face-default-font.html = FAIL
-
// We don't support dynamic fonts on Linux.
// Once we have the sandbox working, we should re-evaluate this.
BUG10278 LINUX : LayoutTests/fast/css/font-face-implicit-local-font.html = FAIL