summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 02:56:10 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 02:56:10 +0000
commit390120a47ac9f0bd17bdc5e1800310bff2dea699 (patch)
treef829a54d189a868856c805737b57bed2577eed51
parent65883fe73a0cff26a343dc54c659661d7a25d99f (diff)
downloadchromium_src-390120a47ac9f0bd17bdc5e1800310bff2dea699.zip
chromium_src-390120a47ac9f0bd17bdc5e1800310bff2dea699.tar.gz
chromium_src-390120a47ac9f0bd17bdc5e1800310bff2dea699.tar.bz2
Webkit roll: 52205->52228
TEST=try servers BUG=none Review URL: http://codereview.chromium.org/500081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34799 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
2 files changed, 7 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 1f4ba47..ba1edab 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "52205",
+ "webkit_revision": "52229",
"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 a971a56..e5007ef 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -192,7 +192,7 @@ WONTFIX SKIP : LayoutTests/webarchive/adopt-inline-styled-node-webarchive.html =
// This test is completely timing dependent. It is testing the time
// between a key event and a search event. You cannot count on this
// always being exactly the same.
-WONTFIX DEBUG : LayoutTests/fast/forms/search-event-delay.html = PASS
+WONTFIX DEBUG : LayoutTests/fast/forms/search-event-delay.html = PASS TEXT
WONTFIX SLOW WIN RELEASE : LayoutTests/fast/forms/search-event-delay.html = FAIL PASS
WONTFIX SLOW MAC RELEASE : LayoutTests/fast/forms/search-event-delay.html = FAIL PASS CRASH
WONTFIX LINUX RELEASE : LayoutTests/fast/forms/search-event-delay.html = FAIL PASS
@@ -3119,11 +3119,15 @@ BUG9798 WIN LINUX : LayoutTests/fast/loader/javascript-url-encoding-2.html = TIM
BUG9798 WIN RELEASE : LayoutTests/fast/loading/subframe-removes-itself.html = TEXT PASS
BUG9798 LINUX MAC RELEASE : LayoutTests/fast/loader/invalid-charset-on-script-crashes-loader.html = TIMEOUT PASS
-// Webkit roll 52198->52208
+// Webkit roll 52198->52205
// 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
+// Webkit roll 52205->52227
+// New expectations added in 52219
+BUG_JPARENT WIN LINUX : LayoutTests/svg/custom/empty-merge.svg = IMAGE+TEXT
+
// Flaky since SVG filters turned on
BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS