From 1df3e154f06c18631f7819d8924da972d643835a Mon Sep 17 00:00:00 2001 From: "dsh@google.com" Date: Wed, 4 Feb 2009 01:43:33 +0000 Subject: This fixes MOST of a layout test. Before the font was WAY off because it couldn't find the correct font. Now the font is perfect, but the listbox controls are different. This is expected, so I'm rebaselining the pixel test. The text diff is still off by one number, so I'm leaving that alone until we figure it out. Review URL: http://codereview.chromium.org/23001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9120 0039d316-1c4b-4281-b951-d872f2087c98 --- .../fast/block/margin-collapse/103-expected.checksum | 1 + .../fast/block/margin-collapse/103-expected.png | Bin 0 -> 13340 bytes webkit/tools/layout_tests/test_lists/tests_fixable.txt | 2 +- webkit/tools/test_shell/test_shell_gtk.cc | 8 ++++++++ 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.checksum create mode 100644 webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.png (limited to 'webkit') diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.checksum new file mode 100644 index 0000000..2af916e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.checksum @@ -0,0 +1 @@ +985b9a89306efbeefc99d5ce8ca75d52 \ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.png new file mode 100644 index 0000000..b8773b4 Binary files /dev/null and b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/margin-collapse/103-expected.png differ diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index d5afd5b..83901e2 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -831,7 +831,7 @@ LINUX : LayoutTests/editing/deleting/deletionUI-single-instance.html = FAIL // Linux: off-by-ones imply font metrics. LINUX MAC : LayoutTests/editing/selection/select-from-textfield-outwards.html = FAIL -// Linux: fonts significantly different. +// Linux: height of window is off. LINUX MAC : LayoutTests/fast/block/margin-collapse/103.html = FAIL // Asks for "system" fonts, which we don't support at all. diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index d910329..8e980f9 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -117,7 +117,15 @@ void TestShell::InitializeTestShell(bool layout_test_mode) { "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold.ttf", "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Bold_Italic.ttf", "/usr/share/fonts/truetype/msttcorefonts/Courier_New_Italic.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Georgia_Bold_Italic.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Georgia_Italic.ttf", "/usr/share/fonts/truetype/msttcorefonts/Impact.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Bold_Italic.ttf", + "/usr/share/fonts/truetype/msttcorefonts/Trebuchet_MS_Italic.ttf", "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman.ttf", "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold.ttf", "/usr/share/fonts/truetype/msttcorefonts/Times_New_Roman_Bold_Italic.ttf", -- cgit v1.1