summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 14:51:56 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 14:51:56 +0000
commit48d8e47acc6f19fd9785ef0bcc697d0ca9ac4172 (patch)
tree6e2579446320b847fb1886dbcf05eddb2b0c5bfd /webkit
parent1cde51596b1ed4925d3f550432496e106de59b98 (diff)
downloadchromium_src-48d8e47acc6f19fd9785ef0bcc697d0ca9ac4172.zip
chromium_src-48d8e47acc6f19fd9785ef0bcc697d0ca9ac4172.tar.gz
chromium_src-48d8e47acc6f19fd9785ef0bcc697d0ca9ac4172.tar.bz2
Roll to webKit 46471 with updated test failures.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index abcb720..c2a126b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3176,3 +3176,10 @@ BUG17845 DEBUG : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-y-prop.ht
BUG17845 DEBUG : LayoutTests/svg/hixie/dynamic/005.xml = CRASH
// This was already SLOW FAIL, only CRASH is new
BUG17845 SLOW : LayoutTests/http/tests/misc/acid3.html = FAIL CRASH
+
+// Test failures from WebKit merge 46426 to 46471
+// These probably just need to be rebaselined on win/linux.
+BUG17883 WIN LINUX : LayoutTests/editing/deleting/delete-3857753-fix.html = FAIL
+BUG17883 WIN LINUX : LayoutTests/editing/deleting/pruning-after-merge-2.html = FAIL
+BUG17883 WIN LINUX : LayoutTests/editing/execCommand/5138441.html = FAIL
+BUG17883 WIN LINUX : LayoutTests/editing/pasteboard/display-block-on-spans.html = FAIL