summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 f04dc7e..4b3399b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51875",
+ "webkit_revision": "51915",
"ffmpeg_revision": "34028",
"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 8cae08b..3915aab 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3658,3 +3658,6 @@ BUG29737 WIN : LayoutTests/svg/filters/subRegion-two-effects.svg = TEXT
// More Webkit Roll to r51875 - rebaseline needed i think
BUG_MICHAELN : LayoutTests/websocket/tests/bad-sub-protocol.html = TEXT
+// WebKit Roll to r51915
+BUG29928 : LayoutTests/websocket/tests/sub-protocol-with-space.html = TEXT
+BUG29930 : LayoutTests/fast/loader/input-element-page-cache-crash.html = TIMEOUT