summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 16:43:34 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 16:43:34 +0000
commitdce1d5a14014a4cf5cca35cce92c114ab813db10 (patch)
tree33b6cea598e0bb8d974ce982e55431b76febf87e /DEPS
parentfe9d156aaaa737e05ce4f69ec7eef03a53663f47 (diff)
downloadchromium_src-dce1d5a14014a4cf5cca35cce92c114ab813db10.zip
chromium_src-dce1d5a14014a4cf5cca35cce92c114ab813db10.tar.gz
chromium_src-dce1d5a14014a4cf5cca35cce92c114ab813db10.tar.bz2
WebKit merge 43371:43401
R=dglazkov Review URL: http://codereview.chromium.org/113150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS10
1 files changed, 8 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index eb1f800..4a92c8c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "43371",
+ "webkit_revision": "43401",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@243",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@15591",
+ "/trunk/deps/third_party/WebKit@15639",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",
@@ -34,6 +34,12 @@ deps = {
"src/webkit/data/layout_tests/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
+ "src/third_party/WebKit/JavaScriptCore":
+ Var("webkit_trunk") + "/JavaScriptCore@" + Var("webkit_revision"),
+
+ "src/third_party/WebKit/WebCore":
+ Var("webkit_trunk") + "/WebCore@" + Var("webkit_revision"),
+
"src/third_party/WebKit/WebKitLibraries":
Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),