summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 09:47:08 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 09:47:08 +0000
commit5dc7336cf3f3e488c805640519d0c501c79a63a9 (patch)
treec40c5ca7e465fb07a10c319a26804a2d221c01fd
parent1f6e1cf6b583c7fa34274bd20e38b227cb222f99 (diff)
downloadchromium_src-5dc7336cf3f3e488c805640519d0c501c79a63a9.zip
chromium_src-5dc7336cf3f3e488c805640519d0c501c79a63a9.tar.gz
chromium_src-5dc7336cf3f3e488c805640519d0c501c79a63a9.tar.bz2
WebKit Update 46507:46531
TBR=tony BUG=none TEST=none Review URL: http://codereview.chromium.org/160321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21948 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 8 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 43c937d..329c76a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "46507",
+ "webkit_revision": "46531",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 870022e..ad9ddfd 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3072,3 +3072,10 @@ BUG17883 WIN LINUX : LayoutTests/editing/deleting/delete-3857753-fix.html = FAIL
BUG17883 WIN LINUX : LayoutTests/editing/deleting/pruning-after-merge-2.html = FAIL
BUG17883 WIN LINUX : LayoutTests/editing/execCommand/5138441.html = FAIL
BUG17883 WIN LINUX : LayoutTests/editing/pasteboard/display-block-on-spans.html = FAIL
+
+// Test failures from WebKit merge 46508 to 46531
+BUG17974 WIN LINUX: LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL
+BUG17974 WIN LINUX: LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL
+BUG17974 : LayoutTests/fast/css/remove-shorthand.html = FAIL
+BUG17974 WIN LINUX: LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
+BUG17974 WIN MAC: LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL