summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 17:00:15 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 17:00:15 +0000
commitf2c3588c639162bdce1b226b7e2936a397dac105 (patch)
treefd6ae2768c51109b03fae7497eb5d0ee1d43941e /webkit
parentbf3c4210d99692c401cfaa298a4cfebdd0962191 (diff)
downloadchromium_src-f2c3588c639162bdce1b226b7e2936a397dac105.zip
chromium_src-f2c3588c639162bdce1b226b7e2936a397dac105.tar.gz
chromium_src-f2c3588c639162bdce1b226b7e2936a397dac105.tar.bz2
Rolling to WebKit r46389 with one test failure. TBR=dglazkov
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6acd2e6..4b27c7c 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3111,3 +3111,5 @@ BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr
BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-column.html = FAIL
BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = FAIL
BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = FAIL
+// Test failures from WebKit merge 46369:46389
+BUG_DARIN WIN LINUX : LayoutTests/editing/style/remove-underline-from-stylesheet.html = FAIL