summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 00:29:06 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 00:29:06 +0000
commit16aef84a15e51aaaf4d1451c80859012a51bb966 (patch)
tree0d82d3e431702c087540c1082db39c540f2b06a9
parent85e2199082e99d515e138a33ddf159b4d9a5d513 (diff)
downloadchromium_src-16aef84a15e51aaaf4d1451c80859012a51bb966.zip
chromium_src-16aef84a15e51aaaf4d1451c80859012a51bb966.tar.gz
chromium_src-16aef84a15e51aaaf4d1451c80859012a51bb966.tar.bz2
Revert 34198 - Roll to webkit r51915
TBR=eroman Review URL: http://codereview.chromium.org/482004 TBR=michaeln@google.com Review URL: http://codereview.chromium.org/481013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34212 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 1 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 4b3399b..f04dc7e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51915",
+ "webkit_revision": "51875",
"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 d89ebd8..a236013 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3658,6 +3658,3 @@ 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