summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 22:34:22 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 22:34:22 +0000
commit719c4d7b4635a8ef8a8aa704ad01251a5732e329 (patch)
tree43f40cae73d6d954d427ebcf69575adbf0c03584 /webkit/tools
parent40893f5fdee344b16a41698929b203a627e048ac (diff)
downloadchromium_src-719c4d7b4635a8ef8a8aa704ad01251a5732e329.zip
chromium_src-719c4d7b4635a8ef8a8aa704ad01251a5732e329.tar.gz
chromium_src-719c4d7b4635a8ef8a8aa704ad01251a5732e329.tar.bz2
Chrome side of webkit merge from r42523 to r42547.
Review URL: http://codereview.chromium.org/75012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index df7af7f..a180e42 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -585,6 +585,9 @@ BUG1124568 DEFER : LayoutTests/fast/dom/Window/window-function-name-getter-prece
BUG4363 DEFER SKIP : LayoutTests/media = TIMEOUT
BUG4363 DEFER SKIP : LayoutTests/fast/media = PASS FAIL
BUG4363 DEFER : LayoutTests/http/tests/media = FAIL
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-poster-from-remote.html = FAIL
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-src-from-remote.html = FAIL
BUG4363 DEFER : LayoutTests/fast/dom/Window/custom-constructors.html = FAIL
// Function arguments object is copied for each access.
@@ -2465,6 +2468,9 @@ BUG10529 MAC RELEASE : LayoutTests/editing/inserting/6703873.html = FAIL
// to include window.showModalDialog, which we give as undefined.
BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL
+// New test from merge 42523:42547. Needs rebaseline.
+BUG_TONY LINUX MAC : LayoutTests/fast/runin/generated.html = FAIL
+
// TODO(brettw) Regressions from merge 42244:42287
BUG10571 WIN : LayoutTests/http/tests/navigation/anchor-basic.html = FAIL
BUG10571 WIN : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL