From df7212f599e4caf6db8569b5256765be59457f78 Mon Sep 17 00:00:00 2001 From: "adamk@chromium.org" Date: Tue, 3 May 2011 16:21:43 +0000 Subject: [PATCH] 2011-05-02 Adam Klein Reviewed by Tony Chang. Roll chromium DEPS to r83722, add new crypto directory to DEPS https://bugs.webkit.org/show_bug.cgi?id=59992 * .gitignore: Ignore new chromium/crypto directory. 2011-05-02 Adam Klein Reviewed by Tony Chang. Roll chromium DEPS to r83722, add new crypto directory to DEPS https://bugs.webkit.org/show_bug.cgi?id=59992 * DEPS: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85607 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .gitignore | 1 + ChangeLog | 10 ++++++++++ Source/WebKit/chromium/ChangeLog | 9 +++++++++ Source/WebKit/chromium/DEPS | 4 +++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 65bb335bac45..20b476a348ca 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ Source/WebKit/chromium/.gclient_entries Source/WebKit/chromium/app/ Source/WebKit/chromium/base/ Source/WebKit/chromium/chromium_deps/ +Source/WebKit/chromium/crypto/ Source/WebKit/chromium/depot_tools/ Source/WebKit/chromium/gfx/ Source/WebKit/chromium/googleurl/ diff --git a/ChangeLog b/ChangeLog index a5fc7200ffe3..a94ccc5e41aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-05-02 Adam Klein + + Reviewed by Tony Chang. + + Roll chromium DEPS to r83722, add new crypto directory to DEPS + https://bugs.webkit.org/show_bug.cgi?id=59992 + + * .gitignore: + Ignore new chromium/crypto directory. + 2011-05-03 Carlos Garcia Campos Reviewed by Eric Seidel. diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index 931c6435d4fb..4cd5b0d1aab3 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,12 @@ +2011-05-02 Adam Klein + + Reviewed by Tony Chang. + + Roll chromium DEPS to r83722, add new crypto directory to DEPS + https://bugs.webkit.org/show_bug.cgi?id=59992 + + * DEPS: + 2011-05-02 Adam Roben Take advantage of implicit conversion from nullptr_t to PassOwnPtr diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS index c0e5a6cc435a..7751a00737fe 100644 --- a/Source/WebKit/chromium/DEPS +++ b/Source/WebKit/chromium/DEPS @@ -32,7 +32,7 @@ vars = { 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', - 'chromium_rev': '81564' + 'chromium_rev': '83722' } deps = { @@ -75,6 +75,8 @@ deps = { # net dependencies 'net': Var('chromium_svn')+'/net@'+Var('chromium_rev'), + 'crypto': + Var('chromium_svn')+'/crypto@'+Var('chromium_rev'), 'sdch': Var('chromium_svn')+'/sdch@'+Var('chromium_rev'), 'sdch/open-vcdiff': -- 2.36.0