[Chromium] Need to remove app/ from DEPS

https://bugs.webkit.org/show_bug.cgi?id=64750

Patch by Robert Sesek <rsesek@chromium.org> on 2011-07-19
Reviewed by Tony Chang.

.:

Remove Source/WebKit/chromium/app/ from .gitignore.

* .gitignore:

Source/WebKit/chromium:

Roll DEPS and remove dependencies on Chromium's /src/app.

* DEPS:
* WebKit.gyp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 85a78e89efeb41b243fafb16543715a30145c791..9c8649a917b3d37f7fa42f795fe02ffcace1e122 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ Source/WebKit/chromium/.gclient_entries
 # Ignore Chromium dependencies
 Source/WebKit/chromium/.gclient
 Source/WebKit/chromium/.gclient_entries
-Source/WebKit/chromium/app/
 Source/WebKit/chromium/base/
 Source/WebKit/chromium/chromium_deps/
 Source/WebKit/chromium/crypto/

diff --git a/ChangeLog b/ChangeLog
index 7d8b3e53ad2e35d1491cf9ba6d47bcae9c9bac4f..b92441ccf764f9948e567e70df715362523bbbf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-19  Robert Sesek  <rsesek@chromium.org>
+
+        [Chromium] Need to remove app/ from DEPS
+        https://bugs.webkit.org/show_bug.cgi?id=64750
+
+        Reviewed by Tony Chang.
+
+        Remove Source/WebKit/chromium/app/ from .gitignore.
+
+        * .gitignore:
+
 2011-07-18  MORITA Hajime  <morrita@google.com>
 
         [ShadowContentElement] forwarded node should be able to access its hosting content element.

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 11b2de0804e8888ab4359515a9a055aee240d6b3..fd41fc613d874f3f22b70cc8482a1375c21b5670 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-19  Robert Sesek  <rsesek@chromium.org>
+
+        [Chromium] Need to remove app/ from DEPS
+        https://bugs.webkit.org/show_bug.cgi?id=64750
+
+        Reviewed by Tony Chang.
+
+        Roll DEPS and remove dependencies on Chromium's /src/app.
+
+        * DEPS:
+        * WebKit.gyp:
+
 2011-07-19  Yury Semikhatsky  <yurys@chromium.org>
 
         [Chromium] Web Inspector: add sanity test for shared worker inspector

diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index d94ed254c5167b8863c4347c7b5538720845e3cd..c0ce0eb5a299a7c07ba04557f237bcf532bdab32 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': '92892'
+  'chromium_rev': '93069'
 }
 
 deps = {
@@ -89,8 +89,6 @@ deps = {
   # webkit dependencies
   'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'),
 
-  'app':
-    Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache
   'gpu':
     Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
   'ipc':

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index 3a7f16aadf9bc8052b533a0825791212227057f8..7eb69c4f04940c43803dbac2ce22e85c2fa7df9b 100644 (file)
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -68,7 +68,6 @@
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
                 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
-                '<(chromium_src_dir)/app/app.gyp:app_base', # For GLContext
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
                 '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',