From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Tue, 7 Dec 2010 17:22:45 -0800
Subject: Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
---
 WebKit/chromium/DEPS | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'WebKit/chromium/DEPS')

diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index f5d56dd..ad0ad75 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '65502'
+  'chromium_rev': '67811'
 }
 
 deps = {
@@ -87,6 +87,8 @@ deps = {
     Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache
   'gpu':
     Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
+  'ipc':
+    Var('chromium_svn')+'/ipc@'+Var('chromium_rev'),
   'media':
     Var('chromium_svn')+'/media@'+Var('chromium_rev'),
   'printing':
@@ -107,20 +109,20 @@ deps = {
     Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
 
   # other third party
-  'third_party':
-    Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
   'third_party/icu':
     From('chromium_deps', 'src/third_party/icu'),
   'third_party/ots':
     From('chromium_deps', 'src/third_party/ots'),
+  'third_party/yasm/source/patched-yasm':
+    From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
+  'third_party':
+    Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
 }
 
 deps_os = {
   'win': {
     'third_party/cygwin':
       From('chromium_deps', 'src/third_party/cygwin'),
-    'third_party/python_24':
-      From('chromium_deps', 'src/third_party/python_24'),
     'third_party/ffmpeg/binaries/chromium/win/ia32':
       From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
     'third_party/lighttpd':
@@ -129,9 +131,6 @@ deps_os = {
       From('chromium_deps', 'src/third_party/nss'),
   },
   'mac': {
-    # needed by ffmpeg
-    'third_party/yasm/source/patched-yasm':
-      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
     'third_party/nss':
       From('chromium_deps', 'src/third_party/nss'),
   },
@@ -139,8 +138,8 @@ deps_os = {
     # Linux, actually.
     'tools/xdisplaycheck':
       Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
-    'third_party/yasm/source/patched-yasm':
-      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
+    'third_party/openssl':
+      From('chromium_deps', 'src/third_party/openssl'),
   },
 }
 
-- 
cgit v1.1