2011-05-02 Adam Klein <adamk@chromium.org>

        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  <adamk@chromium.org>

        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

diff --git a/.gitignore b/.gitignore
index 65bb335bac45c47f7f60122657bb05e09daa84d0..20b476a348ca1587f1f766e3a11376882060149c 100644 (file)
--- 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 a5fc7200ffe34cd583081e33df3689487187d369..a94ccc5e41aab79ea6b216dad7ceed7ee0c4d017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-02  Adam Klein  <adamk@chromium.org>
+
+        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  <cgarcia@igalia.com>
 
         Reviewed by Eric Seidel.

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 931c6435d4fb0b5e9d5443e0bec72118fe100ad6..4cd5b0d1aab35208c09ceef5b6dd313e61e81260 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-02  Adam Klein  <adamk@chromium.org>
+
+        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  <aroben@apple.com>
 
         Take advantage of implicit conversion from nullptr_t to PassOwnPtr

diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index c0e5a6cc435a480a1e70f8896963f67bc18f067e..7751a00737fe1b796173b331a2658df89ffdc67e 100644 (file)
--- 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':