summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 23:10:49 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 23:10:49 +0000
commita47fb6d0f441c34379c294f68cf8b2501cb36348 (patch)
tree72e8d66627df3a7a2b58fc9452bc2515d7a32a76 /webkit
parent373a46081a94ad850299876328b279e25f12e59f (diff)
downloadchromium_src-a47fb6d0f441c34379c294f68cf8b2501cb36348.zip
chromium_src-a47fb6d0f441c34379c294f68cf8b2501cb36348.tar.gz
chromium_src-a47fb6d0f441c34379c294f68cf8b2501cb36348.tar.bz2
WebKit roll 53704 -> 53712.
Failing one websocket test. Adding a bunch of other failures that jorlow will resolve with a 2-sided commit. BUG=32929 TEST=none Review URL: http://codereview.chromium.org/552123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 3cc0c05..dfba25e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3054,3 +3054,14 @@ BUG32864 WIN LINUX MAC : plugins/mouse-events-fixedpos.html = TEXT
// WebKit roll 53655 -> 53704
BUG32898 WIN LINUX MAC : fast/loader/history-forward-in-head.html = TEXT
BUG32900 WIN LINUX : http/tests/misc/slow-loading-mask.html = IMAGE+TEXT
+
+// WebKit roll 53704 -> 53712
+BUG32929 WIN LINUX MAC : fast/dom/Window/window-property-descriptors.html = TEXT
+BUGJORLOW WIN LINUX MAC : fast/dom/Window/invalid-protocol.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/iframe-events.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/index-get-and-set.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/onstorage-attribute-markup.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/onstorage-attribute-setattribute.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/onstorage-attribute-setwindow.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/localstorage/simple-events.html = TEXT
+BUGJORLOW WIN LINUX MAC : storage/domstorage/window-attributes-exist.html = TEXT