summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:46:25 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:46:25 +0000
commit9ba64a829c23da719a8243fcb821c72c00fa616b (patch)
treeb4d0fc54ec4eeda5dbdc7775a8827aa6e4d0586f /webkit
parent8849479a05547c3448747e928019932410173844 (diff)
downloadchromium_src-9ba64a829c23da719a8243fcb821c72c00fa616b.zip
chromium_src-9ba64a829c23da719a8243fcb821c72c00fa616b.tar.gz
chromium_src-9ba64a829c23da719a8243fcb821c72c00fa616b.tar.bz2
Webkit merge from 50073:50101.
A couple tests added by chromium folks that need to be rebaselined. TBR=jorlow Review URL: http://codereview.chromium.org/338026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-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 5e0962d..18489cc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3252,3 +3252,9 @@ BUG_TONY : LayoutTests/media/video-seek-past-end-paused.html = FAIL
BUG_TONY : LayoutTests/media/video-src-change.html = FAIL
BUG_TONY LINUX : LayoutTests/media/video-seekable.html = FAIL
BUG_TONY MAC : LayoutTests/media/video-error-abort.html = FAIL
+
+// WebKit roll 50073:50101
+// jorlow to add expected results.
+BUG_JORLOW : LayoutTests/storage/domstorage/documentURI.html = FAIL
+// Test added by Ryosuke: http://trac.webkit.org/changeset/50090
+BUG_TONY : LayoutTests/editing/style/remove-nested-inline-styles.html = FAIL