summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 01:14:33 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 01:14:33 +0000
commit8527c0a1a25c4af1181fc0c12d0ff045707b030a (patch)
tree470f2afd2d055551ad79914c12d860259ae13dde
parent5bbe884f693a4cf926cfb3792e4f86dfb5240e17 (diff)
downloadchromium_src-8527c0a1a25c4af1181fc0c12d0ff045707b030a.zip
chromium_src-8527c0a1a25c4af1181fc0c12d0ff045707b030a.tar.gz
chromium_src-8527c0a1a25c4af1181fc0c12d0ff045707b030a.tar.bz2
WebKit roll 55373:55380.
BUG=none TEST=none TBR=darin Review URL: http://codereview.chromium.org/660315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40339 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 d500ceb..2b4a68b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55373",
+ "webkit_revision": "55380",
"ffmpeg_revision": "40324",
"skia_revision": "504",
"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 75ccc18..06ae937 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2923,3 +2923,6 @@ BUG36967 : java/array-sort.html = FAIL
// httponly-cookie.pl fails because it fails to be serveed as cgi script on Win
BUG37049 WIN SKIP : websocket/tests/cookies/httponly-cookie.pl = PASS
+
+// WebKit roll 55373:55380
+BUG37136 : fast/loader/api-test-go-to-current-back-forward-item.html = TIMEOUT