summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 22:20:35 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 22:20:35 +0000
commit7ecf29ce9af999e31929e8795d8d020d95219276 (patch)
tree8006a387fdf7a4ae71b8465b0519ddc7e678ce72
parent4e50f5c1e1aed14e00e73425c1464219f7833552 (diff)
downloadchromium_src-7ecf29ce9af999e31929e8795d8d020d95219276.zip
chromium_src-7ecf29ce9af999e31929e8795d8d020d95219276.tar.gz
chromium_src-7ecf29ce9af999e31929e8795d8d020d95219276.tar.bz2
WebKit roll 87521:87572.
Suppress one failure on windows until it can be rebaselined. TBR=mnaganov@chromium.org' git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87105 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a7a6e0a..9205c5e 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "87521",
+ "webkit_revision": "87572",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ba7cc36..cc6f72d 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -18,3 +18,6 @@ BUG_HCLAM : fast/url/ipv6.html = TEXT
// Probably just need rebaselining, but putting here to get the @DEPS builders green.
BUGCR84161 : fast/dom/navigator-detached-no-crash.html = TEXT
BUGCR84161 : fast/dom/register-protocol-handler.html = TEXT
+
+// Just needs rebasing, suppressing until all baselines are available.
+BUGADAMK WIN : svg/zoom/page/zoom-foreignObject.svg = IMAGE TEXT IMAGE+TEXT