diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit/chromium/DEPS | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit/chromium/DEPS')
| -rw-r--r-- | Source/WebKit/chromium/DEPS | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS index 8d08c3f..8ad3c5e 100644 --- a/Source/WebKit/chromium/DEPS +++ b/Source/WebKit/chromium/DEPS @@ -32,7 +32,7 @@ vars = { 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', - 'chromium_rev': '71969' + 'chromium_rev': '73764' } deps = { @@ -56,6 +56,8 @@ deps = { # skia dependencies 'skia': Var('chromium_svn')+'/skia@'+Var('chromium_rev'), + 'third_party/skia/gpu': + From('chromium_deps', 'src/third_party/skia/gpu'), 'third_party/skia/src': From('chromium_deps', 'src/third_party/skia/src'), 'third_party/skia/include': @@ -66,6 +68,8 @@ deps = { Var('chromium_svn')+'/testing@'+Var('chromium_rev'), 'testing/gtest': From('chromium_deps', 'src/testing/gtest'), + 'testing/gmock': + From('chromium_deps', 'src/testing/gmock'), # v8 javascript engine 'v8': From('chromium_deps', 'src/v8'), |