summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 22:39:58 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 22:39:58 +0000
commitd3a1b3c81b49ea4089ef19237c51508670acffca (patch)
treecc441dbbc8027595733a86aec0e6d462a062df3b
parente4c7ee433ae118611cd8c204d87c17aad5c3d964 (diff)
downloadchromium_src-d3a1b3c81b49ea4089ef19237c51508670acffca.zip
chromium_src-d3a1b3c81b49ea4089ef19237c51508670acffca.tar.gz
chromium_src-d3a1b3c81b49ea4089ef19237c51508670acffca.tar.bz2
Roll to webkit r51915
TBR=eroman Review URL: http://codereview.chromium.org/482004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34198 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 582f38f..faa01f0 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 213682f..b4990e7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3657,3 +3657,7 @@ 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 \ No newline at end of file