From 6b70adc33054f8aee8c54d0f460458a9df11b8a5 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Thu, 18 Nov 2010 17:33:13 -0800 Subject: Merge WebKit at r72274: Initial merge by git. Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb --- WebKit/chromium/DEPS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'WebKit/chromium/DEPS') diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS index 4fc0372..f5d56dd 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': '65229' + 'chromium_rev': '65502' } deps = { @@ -95,6 +95,8 @@ deps = { Var('chromium_svn')+'/ppapi@'+Var('chromium_rev'), 'third_party/angle': # needed by the gpu process From('chromium_deps', 'src/third_party/angle'), + 'third_party/libvpx': # needed by webkit/media + From('chromium_deps', 'src/third_party/libvpx'), 'third_party/ffmpeg': # needed by webkit/media From('chromium_deps', 'src/third_party/ffmpeg'), 'third_party/libwebp': -- cgit v1.1