Merge webkit.org at r51976 : Initial merge by git.

Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43

1 files changed, 20 insertions, 10 deletions

diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 5f5b9b8..fc90187 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -35,18 +35,19 @@ vars = {
   'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
 
   # Dependencies' revisions to use:
-  'chromium_rev': '28710',
-  'google-url_rev': '119',
-  'gtest_rev': '329',
-  'gyp_rev': '685',
-  'icu_rev': '27687',
+  'chromium_rev': '31834',
+  'google-url_rev': '120',
+  'gtest_rev': '336',
+  'gyp_rev': '751',
+  'icu_rev': '31724',
   'openvcdiff_rev': '28',
-  'skia_rev': '376',
-  'v8_rev': '3030',
+  'ots_rev': '19',
+  'skia_rev': '424',
+  'v8_rev': '3276',
 
   # Windows:
   'cygwin_rev': '11984',
-  'ffmpeg_ia32_rev': '28488',
+  'ffmpeg_ia32_rev': '30374',
   'pthreads-win32_rev': '26716',
   'python_24_rev': '22967',
 }
@@ -55,8 +56,6 @@ deps = {
   # build tools
   'build':
     Var('chromium_svn')+'/build@'+Var('chromium_rev'),
-  'webkit/build':
-      Var('chromium_svn')+'/webkit/build@'+Var('chromium_rev'),
   'tools/gyp':
     'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'),
 
@@ -120,6 +119,9 @@ deps = {
   'third_party/npapi':
     Var('chromium_svn')+'/third_party/npapi@'+Var('chromium_rev'),
 
+  'third_party/ots':
+    'http://ots.googlecode.com/svn/trunk@'+Var('ots_rev'),
+
   'third_party/sqlite':
     Var('chromium_svn')+'/third_party/sqlite@'+Var('chromium_rev'),
 
@@ -141,6 +143,14 @@ deps_os = {
     'third_party/pthreads-win32':
       Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
   },
+  'unix': {
+    # Linux, actually.
+    'third_party/harfbuzz':
+      Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'),
+
+    'tools/xdisplaycheck':
+      Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
+  },
 }
 
 skip_child_includes = [