summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 09:14:21 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-06 09:14:21 +0000
commite598ad77dddb4046be70be45afaec8ab93c8f03b (patch)
tree357503174606b6b5e899f3da2428f23543244273 /webkit/tools
parentaa27148007a9ee460f4e5027fe8d3db7c3fc7246 (diff)
downloadchromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.zip
chromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.tar.gz
chromium_src-e598ad77dddb4046be70be45afaec8ab93c8f03b.tar.bz2
WebKit merge 40539:40668 [chromium side]
Just adding and removing files corresponding to what has been done in webkit, and one test regression. Review URL: http://codereview.chromium.org/21124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index fcf7485..83487c5 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1752,3 +1752,11 @@ LINUX : LayoutTests/fast/block/positioning/047.html = FAIL
LINUX : LayoutTests/svg/W3C-SVG-1.1/text-path-01-b.svg = FAIL
LINUX : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL
+
+// Regressions from WebKit merge 40539:40668
+//
+// According to the text of the test it passes, but it looks
+// like it is using a different font to render now than it
+// did before and that may be a bug. It looks like
+// jshin@chromium.org did several font related changes in this merge.
+LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL