summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-17 20:45:46 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-17 20:45:46 +0000
commitcaa9fdc35c4738519d6743f0e3223ce7761c4721 (patch)
tree7b12b3c92cfdbf0c02aee462b72a72b06f2dd241 /DEPS
parent6d2de293a9dd1d3566f5ab4526c14094a90e3b4b (diff)
downloadchromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.zip
chromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.tar.gz
chromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.tar.bz2
WebKit Merge 42580:42609, Chromium side.
Changes to ScriptController, glue due to http://trac.webkit.org/changeset/42583 Test rebaselines due to: * http://trac.webkit.org/changeset/42599 * http://trac.webkit.org/changeset/42583 * http://trac.webkit.org/changeset/42600 * http://trac.webkit.org/changeset/42586 R=levin Review URL: http://codereview.chromium.org/79038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index ce241df..81353b1 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "42580",
+ "webkit_revision": "42609",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@13917",
+ "/trunk/deps/third_party/WebKit@13964",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",