Split webkit_storage target into webkit_storage_{browser,common,rende…

…rer} This does: - Remove all webkit/browser/foo/*.gypi, webkit/common/foo/*.gypi for storage - Add three top-level gyp's in webkit/: storage_{browser,common,renderer}.gyp storage_common and storage_renderer might be able to be subsumed in bigger targets for common|renderer, but believe we can do that later when necessary. BUG=239109 TBR=mnaganov,thestig,avi NOTRY=true Review URL: https://chromiumcodereview.appspot.com/15716007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205463 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jun 11, 2013 · cc26886 · cc26886
1 parent 3684fa6
commit cc26886
Show file tree

Hide file tree

Showing 45 changed files with 440 additions and 547 deletions.
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
@@ -20,7 +20,8 @@
         '../../skia/skia.gyp:skia',
         '../../ui/ui.gyp:ui',
         '../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '../../webkit/support/webkit_support.gyp:webkit_storage',
+        '../../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../../webkit/storage_common.gyp:webkit_storage_common',
         'android_webview_native_jni',
       ],
       'include_dirs': [

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -2380,9 +2380,10 @@
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
             '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/support/webkit_support.gyp:webkit_resources',
-            '../webkit/support/webkit_support.gyp:webkit_storage',
           ],
           'defines': [
             '<@(nacl_defines)',

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
@@ -90,7 +90,8 @@
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:webkit_resources',
-        '../webkit/support/webkit_support.gyp:webkit_storage',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
         'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
@@ -41,11 +41,12 @@
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../url/url.gyp:url_lib',
+        '../webkit/base/webkit_base.gyp:webkit_base',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:webkit_base',
         '../webkit/support/webkit_support.gyp:webkit_resources',
-        '../webkit/support/webkit_support.gyp:webkit_storage',
       ],
       'include_dirs': [
         '..',

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
@@ -2380,8 +2380,9 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:webkit_common',
-            '../webkit/support/webkit_support.gyp:webkit_storage',
             '../webkit/support/webkit_support.gyp:webkit_resources',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
           ],
           'defines': [
             '<@(nacl_defines)',

diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc
@@ -12,6 +12,7 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
+#include "third_party/WebKit/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/common/fileapi/directory_entry.h"

diff --git a/content/content_browser.gypi b/content/content_browser.gypi
@@ -1156,8 +1156,9 @@
         '../ui/surface/surface.gyp:surface',
         '../webkit/support/webkit_support.gyp:webkit_common',
         '../webkit/support/webkit_support.gyp:webkit_resources',
-        '../webkit/support/webkit_support.gyp:webkit_storage',
         '../webkit/support/webkit_support.gyp:webkit_strings',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
       ],
     }],
     ['OS!="mac" and OS!="ios"', {

diff --git a/content/content_child.gypi b/content/content_child.gypi
@@ -88,8 +88,8 @@
       'dependencies': [
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/npapi/npapi.gyp:npapi',
+        '../webkit/base/webkit_base.gyp:webkit_base',
         '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:webkit_base',
       ],
     }],
   ],

diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -372,9 +372,10 @@
         '../media/media.gyp:shared_memory_support',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
+        '../webkit/base/webkit_base.gyp:webkit_base',
+        '../webkit/storage_browser.gyp:webkit_storage_browser',
+        '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:webkit_base',
-        '../webkit/support/webkit_support.gyp:webkit_storage',
       ],
     }],
     ['OS=="android"',{

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
@@ -20,6 +20,8 @@
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
     '../webkit/plugins/webkit_plugins.gyp:plugins_common',
+    '../webkit/storage_renderer.gyp:webkit_storage_renderer',
+    '../webkit/storage_common.gyp:webkit_storage_common',
     '../webkit/support/webkit_support.gyp:glue',
     '../webkit/support/webkit_support.gyp:glue_common',
     '../webkit/support/webkit_support.gyp:glue_renderer',

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -171,8 +171,10 @@
             '../ui/surface/surface.gyp:surface',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/support/webkit_support.gyp:webkit_storage',
             '../webkit/support/webkit_support.gyp:webkit_support_common',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/storage_renderer.gyp:webkit_storage_renderer',
           ],
         }],
         ['OS == "win" or toolkit_uses_gtk == 1', {
@@ -564,16 +566,18 @@
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
+            '../webkit/base/webkit_base.gyp:webkit_base',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
             '../webkit/plugins/webkit_plugins.gyp:test_mock_plugin_list',
+            '../webkit/storage_browser.gyp:webkit_storage_browser',
+            '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/storage_renderer.gyp:webkit_storage_renderer',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/support/webkit_support.gyp:glue_renderer',
             '../webkit/support/webkit_support.gyp:plugins',
-            '../webkit/support/webkit_support.gyp:webkit_base',
             '../webkit/support/webkit_support.gyp:webkit_common',
             '../webkit/support/webkit_support.gyp:webkit_media',
-            '../webkit/support/webkit_support.gyp:webkit_storage',
           ],
         }],
         ['enable_plugins==0', {

diff --git a/webkit/base/webkit_base.gypi → webkit/base/webkit_base.gyp b/webkit/base/webkit_base.gypi → webkit/base/webkit_base.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

diff --git a/webkit/browser/appcache/appcache_response.h b/webkit/browser/appcache/appcache_response.h
@@ -13,6 +13,7 @@
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_info.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class IOBuffer;
@@ -256,4 +257,3 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
 }  // namespace appcache
 
 #endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
-
diff --git a/webkit/browser/appcache/webkit_browser_appcache.gypi b/webkit/browser/appcache/webkit_browser_appcache.gypi
diff --git a/webkit/browser/blob/webkit_browser_blob.gypi b/webkit/browser/blob/webkit_browser_blob.gypi
diff --git a/webkit/browser/database/webkit_browser_database.gypi b/webkit/browser/database/webkit_browser_database.gypi
diff --git a/webkit/browser/dom_storage/webkit_browser_dom_storage.gypi b/webkit/browser/dom_storage/webkit_browser_dom_storage.gypi
diff --git a/webkit/browser/fileapi/file_system_mount_point_provider.h b/webkit/browser/fileapi/file_system_mount_point_provider.h
@@ -17,6 +17,8 @@
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
+class GURL;
+
 namespace webkit_blob {
 class FileStreamReader;
 }