summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 05:28:58 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 05:28:58 +0000
commit2382a3be1239e3a06f0d23c38d54c861d5ce6163 (patch)
tree2c0b4f03b1be499cc0b88937e7e9887ccca554b8 /DEPS
parentddcefb91642b8c2768770dc809befda86fde3a90 (diff)
downloadchromium_src-2382a3be1239e3a06f0d23c38d54c861d5ce6163.zip
chromium_src-2382a3be1239e3a06f0d23c38d54c861d5ce6163.tar.gz
chromium_src-2382a3be1239e3a06f0d23c38d54c861d5ce6163.tar.bz2
Revert 83297 - Second attempt. Roll WebKit 84939:85141. Removed now-upstreamed test expectations. Added downstream suppressions for a few new failures. BUG=none TBR=dpranke Review URL: http://codereview.chromium.org/6905087
Caused build breakage on Win Builder (dbg)(shared), Linux Clang (dbg) and Linux Views Clang (dbg). Didn't understand the need to watch some of the canaries. TBR=kbr@google.com Review URL: http://codereview.chromium.org/6901082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 4a6f3af..c81a94a 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "85141",
+ "webkit_revision": "84939",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed.