summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:01:44 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:01:44 +0000
commitf8b7dc91f322f740f226a8a49f3d73670a481f2e (patch)
tree77a93191c7ad892c58349524acf6c6ec4d9b91f1
parent9fe33bb1b358cf8090d8a5229928121d6d2a192f (diff)
downloadchromium_src-f8b7dc91f322f740f226a8a49f3d73670a481f2e.zip
chromium_src-f8b7dc91f322f740f226a8a49f3d73670a481f2e.tar.gz
chromium_src-f8b7dc91f322f740f226a8a49f3d73670a481f2e.tar.bz2
WebKit roll 52198->52208.
Update test expectations accordingly. BUG=none TEST=canary bots, try servers Review URL: http://codereview.chromium.org/500072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34747 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 7 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 7189a80..1f4ba47 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "52198",
+ "webkit_revision": "52205",
"ffmpeg_revision": "34297",
"skia_revision": "451",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b7bffc9..ca4c3d0 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3231,5 +3231,11 @@ BUG30543 : LayoutTests/storage/domstorage/localstorage/enumerate-with-length-and
BUG30545 WIN : LayoutTests/websocket/tests/bad-sub-protocol.html = CRASH PASS
BUG30593 LINUX MAC : LayoutTests/websocket/tests/url-with-credential.html = TEXT PASS
+// Webkit roll 52198->52208
+// Newly added test in r52202
+BUG_JPARENT : LayoutTests/svg/filters/filter-source-position.svg = IMAGE+TEXT
+// Started failing with r52207
+BUG_JPARENT : LayoutTests/fast/repaint/backgroundSizeRepaint.html = IMAGE
+
// Flaky since SVG filters turned on
BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS \ No newline at end of file