summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-02 06:49:04 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-02 06:49:04 +0000
commit4db209f084d17954ec4485855252867a7b672593 (patch)
tree1b7e0776a003a5225a3d84ca068b5da1180bda8f
parentd06284fdb67b7adf96fd3fbf88b6fcd7e4bbccb3 (diff)
downloadchromium_src-4db209f084d17954ec4485855252867a7b672593.zip
chromium_src-4db209f084d17954ec4485855252867a7b672593.tar.gz
chromium_src-4db209f084d17954ec4485855252867a7b672593.tar.bz2
WebKit Roll 51581:51584
BUG=28266 TEST=trybots Review URL: http://codereview.chromium.org/462003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33552 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt9
2 files changed, 7 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index f5d5442..556205c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51581",
+ "webkit_revision": "51584",
"ffmpeg_revision": "30374",
"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 2e892dd..83e9c83 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2973,9 +2973,6 @@ BUG28095 MAC : LayoutTests/http/tests/cookies/simple-cookies-expired.html = PASS
// Need to add Chromium localized strings for the feature. Upstream r51172
BUG28264 : LayoutTests/fast/forms/validationMessage.html = FAIL
-// New feature, but the failure seems to be real (not rebaseline). Upstream r51159.
-BUG28266 : LayoutTests/fast/forms/input-step.html = FAIL
-
// Video Captions are added upsteram (r51191), need to implement.
BUG28301 : LayoutTests/media/media-captions.html = TIMEOUT
@@ -3037,3 +3034,9 @@ BUG29157 WIN LINUX MAC : LayoutTests/svg/animations/animVal-basics.html = TIMEO
// New failures from WebKit r51577
BUG29164 WIN LINUX MAC : LayoutTests/fast/frames/sandboxed-iframe-plugins.html = TEXT
+
+// New failures from WebKit merge 51581:51584
+BUG29167 MAC : LayoutTests/tables/mozilla/bugs/bug28341.html = IMAGE
+BUG29167 MAC : LayoutTests/plugins/window-open.html = TEXT PASS
+BUG29167 MAC : LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f.svg = TEXT PASS
+BUG29167 MAC : LayoutTests/fast/dom/replaceChild.html = IMAGE PASS