summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 00:24:47 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 00:24:47 +0000
commit9a96d729a2dbe40bac29ff0fbda0602ea4bf50d5 (patch)
tree9adf3790b7ad094419b040ed950405677290e67c /webkit
parentcd6966178e34f1b71bdb36bb6f1b4cc39e103297 (diff)
downloadchromium_src-9a96d729a2dbe40bac29ff0fbda0602ea4bf50d5.zip
chromium_src-9a96d729a2dbe40bac29ff0fbda0602ea4bf50d5.tar.gz
chromium_src-9a96d729a2dbe40bac29ff0fbda0602ea4bf50d5.tar.bz2
WebKit merge 45985:45998
BUG=none TEST=green build Review URL: http://codereview.chromium.org/155666 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5186e6d..fa574cb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2969,3 +2969,8 @@ BUG16878 WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL
// Failure from WebKit merge 45958:45975
BUG16924 WIN : LayoutTests/media/video-source-type-params.html = FAIL CRASH
+
+// Failure from WebKit merge 45985:45998
+BUG16962 LINUX WIN : LayoutTests/fast/css/nested-floating-relative-position-percentages.html = FAIL
+BUG16962 LINUX WIN : LayoutTests/fast/forms/get-file-upload.html = TIMEOUT
+BUG16962 MAC : LayoutTests/fast/forms/get-file-upload.html = TIMEOUT