From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebKit/chromium/DEPS | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'WebKit/chromium/DEPS')

diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 32c01f0..0992f31 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': '67532'
+  'chromium_rev': '68558'
 }
 
 deps = {
@@ -109,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':
@@ -131,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'),
   },
@@ -141,8 +138,6 @@ 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