summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 5 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 060cd48..23b9559 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55670",
+ "webkit_revision": "55674",
"ffmpeg_revision": "40718",
"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 36ff7ed..7d37c06 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2844,7 +2844,7 @@ BUG36846 : java/java-and-plugins.html = TEXT
BUG36966 : fast/loader/about-blank-hash-kept.html = FAIL
BUG36967 : java/array-sort.html = FAIL
-// httponly-cookie.pl fails because it fails to be serveed as cgi script on Win
+// httponly-cookie.pl fails because it fails to be served as cgi script on Win
BUG37049 WIN SKIP : websocket/tests/cookies/httponly-cookie.pl = PASS
// WebKit roll 55373:55380
@@ -2863,3 +2863,6 @@ BUG37710 MAC SKIP : media/video-src-change.html = CRASH PASS
// WebKit roll 55654 -> 55670
BUG_JIANLI : http/tests/local/send-sliced-dragged-file.html = FAIL
+// WebKit roll 55670 -> 55674
+BUG_37684 SKIP : = http/tests/cookies/third-party-cookie-relaxing.html = FAIL
+