Changeset 60823 in webkit

Timestamp:

Jun 7, 2010 11:36:14 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-06-07 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] roll chromium DEPS
​https://bugs.webkit.org/show_bug.cgi?id=40277

• DEPS:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• DEPS (modified) (5 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-07  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] roll chromium DEPS
+        https://bugs.webkit.org/show_bug.cgi?id=40277
+
+        * DEPS:
+
 2010-06-07  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '48624',
+  'chromium_rev': '49129',
 }
 
@@ -93 +93 @@
     Var('chromium_svn')+'/third_party/glew@'+Var('chromium_rev'),
   'third_party/ffmpeg': # needed by webkit/media
-    Var('chromium_svn')+'/third_party/ffmpeg@'+Var('chromium_rev'),
+    From('chromium_deps', 'src/third_party/ffmpeg'),
   'third_party/libvpx/include':
     From('chromium_deps', 'src/third_party/libvpx/include'),
@@ -150 +150 @@
     Var('chromium_svn')+'/third_party/zlib@'+Var('chromium_rev'),
 
-  'third_party/ffmpeg/source/patched-ffmpeg-mt':
-    From('chromium_deps', 'src/third_party/ffmpeg/source/patched-ffmpeg-mt'),
+  'third_party/mozilla':
+    Var('chromium_svn')+'/third_party/mozilla@'+Var('chromium_rev'),
 }
 
@@ -164 +164 @@
     'third_party/lighttpd':
       From('chromium_deps', 'src/third_party/lighttpd'),
-    # base.gypi depends on nss on Windows
     'third_party/nss':
       From('chromium_deps', 'src/third_party/nss'),
@@ -174 +173 @@
     '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'),
   },
   'unix': {