diff options
122 files changed, 438 insertions, 364 deletions
diff --git a/webkit/browser/appcache/appcache.h b/webkit/browser/appcache/appcache.h index 556a789d..71757ba 100644 --- a/webkit/browser/appcache/appcache.h +++ b/webkit/browser/appcache/appcache.h @@ -16,7 +16,7 @@ #include "webkit/browser/appcache/appcache_database.h" #include "webkit/browser/appcache/appcache_entry.h" #include "webkit/browser/appcache/manifest_parser.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { @@ -27,7 +27,8 @@ class AppCacheStorage; // Set of cached resources for an application. A cache exists as long as a // host is associated with it, the cache is in an appcache group or the // cache is being created during an appcache upate. -class WEBKIT_STORAGE_EXPORT AppCache : public base::RefCounted<AppCache> { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCache + : public base::RefCounted<AppCache> { public: typedef std::map<GURL, AppCacheEntry> EntryMap; typedef std::set<AppCacheHost*> AppCacheHosts; diff --git a/webkit/browser/appcache/appcache_backend_impl.h b/webkit/browser/appcache/appcache_backend_impl.h index 1b218831..2bdc574 100644 --- a/webkit/browser/appcache/appcache_backend_impl.h +++ b/webkit/browser/appcache/appcache_backend_impl.h @@ -7,13 +7,13 @@ #include "base/containers/hash_tables.h" #include "webkit/browser/appcache/appcache_host.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { class AppCacheService; -class WEBKIT_STORAGE_EXPORT AppCacheBackendImpl { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheBackendImpl { public: AppCacheBackendImpl(); ~AppCacheBackendImpl(); diff --git a/webkit/browser/appcache/appcache_database.h b/webkit/browser/appcache/appcache_database.h index 104aa86..e945c20 100644 --- a/webkit/browser/appcache/appcache_database.h +++ b/webkit/browser/appcache/appcache_database.h @@ -15,8 +15,8 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" namespace sql { class Connection; @@ -27,9 +27,9 @@ class StatementID; namespace appcache { -class WEBKIT_STORAGE_EXPORT AppCacheDatabase { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase { public: - struct WEBKIT_STORAGE_EXPORT GroupRecord { + struct WEBKIT_STORAGE_BROWSER_EXPORT GroupRecord { GroupRecord(); ~GroupRecord(); @@ -40,7 +40,7 @@ class WEBKIT_STORAGE_EXPORT AppCacheDatabase { base::Time last_access_time; }; - struct WEBKIT_STORAGE_EXPORT CacheRecord { + struct WEBKIT_STORAGE_BROWSER_EXPORT CacheRecord { CacheRecord() : cache_id(0), group_id(0), online_wildcard(false), cache_size(0) {} @@ -61,7 +61,7 @@ class WEBKIT_STORAGE_EXPORT AppCacheDatabase { int64 response_size; }; - struct WEBKIT_STORAGE_EXPORT NamespaceRecord { + struct WEBKIT_STORAGE_BROWSER_EXPORT NamespaceRecord { NamespaceRecord(); ~NamespaceRecord(); diff --git a/webkit/browser/appcache/appcache_disk_cache.h b/webkit/browser/appcache/appcache_disk_cache.h index 9fa8840..bb1495c 100644 --- a/webkit/browser/appcache/appcache_disk_cache.h +++ b/webkit/browser/appcache/appcache_disk_cache.h @@ -11,13 +11,13 @@ #include "base/memory/scoped_ptr.h" #include "net/disk_cache/disk_cache.h" #include "webkit/browser/appcache/appcache_response.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { // An implementation of AppCacheDiskCacheInterface that // uses net::DiskCache as the backing store. -class WEBKIT_STORAGE_EXPORT AppCacheDiskCache +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCache : public AppCacheDiskCacheInterface { public: AppCacheDiskCache(); diff --git a/webkit/browser/appcache/appcache_group.h b/webkit/browser/appcache/appcache_group.h index a3dfdd9..aeca8a9 100644 --- a/webkit/browser/appcache/appcache_group.h +++ b/webkit/browser/appcache/appcache_group.h @@ -15,7 +15,7 @@ #include "base/observer_list.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { @@ -27,11 +27,11 @@ class HostObserver; // Collection of application caches identified by the same manifest URL. // A group exists as long as it is in use by a host or is being updated. -class WEBKIT_STORAGE_EXPORT AppCacheGroup +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheGroup : public base::RefCounted<AppCacheGroup> { public: - class WEBKIT_STORAGE_EXPORT UpdateObserver { + class WEBKIT_STORAGE_BROWSER_EXPORT UpdateObserver { public: // Called just after an appcache update has completed. virtual void OnUpdateComplete(AppCacheGroup* group) = 0; diff --git a/webkit/browser/appcache/appcache_host.h b/webkit/browser/appcache/appcache_host.h index 66de2e3..4cd1f36 100644 --- a/webkit/browser/appcache/appcache_host.h +++ b/webkit/browser/appcache/appcache_host.h @@ -13,9 +13,9 @@ #include "webkit/browser/appcache/appcache_group.h" #include "webkit/browser/appcache/appcache_service.h" #include "webkit/browser/appcache/appcache_storage.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" #include "webkit/glue/resource_type.h" -#include "webkit/storage/webkit_storage_export.h" namespace net { class URLRequest; @@ -32,12 +32,12 @@ typedef base::Callback<void(bool, void*)> StartUpdateCallback; typedef base::Callback<void(bool, void*)> SwapCacheCallback; // Server-side representation of an application cache host. -class WEBKIT_STORAGE_EXPORT AppCacheHost +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheHost : public AppCacheStorage::Delegate, public AppCacheGroup::UpdateObserver { public: - class WEBKIT_STORAGE_EXPORT Observer { + class WEBKIT_STORAGE_BROWSER_EXPORT Observer { public: // Called just after the cache selection algorithm completes. virtual void OnCacheSelectionComplete(AppCacheHost* host) = 0; diff --git a/webkit/browser/appcache/appcache_interceptor.h b/webkit/browser/appcache/appcache_interceptor.h index e086fbb..bfff0d0 100644 --- a/webkit/browser/appcache/appcache_interceptor.h +++ b/webkit/browser/appcache/appcache_interceptor.h @@ -8,8 +8,8 @@ #include "base/memory/singleton.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/glue/resource_type.h" -#include "webkit/storage/webkit_storage_export.h" namespace appcache { @@ -18,7 +18,7 @@ class AppCacheService; // An interceptor to hijack requests and potentially service them out of // the appcache. -class WEBKIT_STORAGE_EXPORT AppCacheInterceptor +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInterceptor : public net::URLRequest::Interceptor { public: // Registers a singleton instance with the net library. diff --git a/webkit/browser/appcache/appcache_quota_client.h b/webkit/browser/appcache/appcache_quota_client.h index 14b4329..d2efb12 100644 --- a/webkit/browser/appcache/appcache_quota_client.h +++ b/webkit/browser/appcache/appcache_quota_client.h @@ -16,8 +16,8 @@ #include "webkit/browser/appcache/appcache_storage.h" #include "webkit/browser/quota/quota_client.h" #include "webkit/browser/quota/quota_task.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace appcache { @@ -56,7 +56,8 @@ class AppCacheQuotaClient : public quota::QuotaClient { friend class AppCacheStorageImpl; // for NotifyAppCacheIsReady friend class AppCacheQuotaClientTest; - WEBKIT_STORAGE_EXPORT explicit AppCacheQuotaClient(AppCacheService* service); + WEBKIT_STORAGE_BROWSER_EXPORT + explicit AppCacheQuotaClient(AppCacheService* service); void DidDeleteAppCachesForOrigin(int rv); void GetOriginsHelper(quota::StorageType type, @@ -68,8 +69,8 @@ class AppCacheQuotaClient : public quota::QuotaClient { net::CancelableCompletionCallback* GetServiceDeleteCallback(); // For use by appcache internals during initialization and shutdown. - WEBKIT_STORAGE_EXPORT void NotifyAppCacheReady(); - WEBKIT_STORAGE_EXPORT void NotifyAppCacheDestroyed(); + WEBKIT_STORAGE_BROWSER_EXPORT void NotifyAppCacheReady(); + WEBKIT_STORAGE_BROWSER_EXPORT void NotifyAppCacheDestroyed(); // Prior to appcache service being ready, we have to queue // up reqeusts and defer acting on them until we're ready. diff --git a/webkit/browser/appcache/appcache_request_handler.h b/webkit/browser/appcache/appcache_request_handler.h index 4eb7bf6..1b7753c 100644 --- a/webkit/browser/appcache/appcache_request_handler.h +++ b/webkit/browser/appcache/appcache_request_handler.h @@ -9,8 +9,8 @@ #include "base/supports_user_data.h" #include "webkit/browser/appcache/appcache_entry.h" #include "webkit/browser/appcache/appcache_host.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/glue/resource_type.h" -#include "webkit/storage/webkit_storage_export.h" namespace net { class NetworkDelegate; @@ -27,7 +27,7 @@ class AppCacheURLRequestJob; // given the opportunity to hijack the request along the way. Callers // should use AppCacheHost::CreateRequestHandler to manufacture instances // that can retrieve resources for a particular host. -class WEBKIT_STORAGE_EXPORT AppCacheRequestHandler +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheRequestHandler : public base::SupportsUserData::Data, public AppCacheHost::Observer, public AppCacheStorage::Delegate { diff --git a/webkit/browser/appcache/appcache_response.h b/webkit/browser/appcache/appcache_response.h index 63bb7da..49b430f 100644 --- a/webkit/browser/appcache/appcache_response.h +++ b/webkit/browser/appcache/appcache_response.h @@ -12,8 +12,8 @@ #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/http/http_response_info.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" namespace net { class IOBuffer; @@ -27,7 +27,7 @@ static const int kUnkownResponseDataSize = -1; // Response info for a particular response id. Instances are tracked in // the working set. -class WEBKIT_STORAGE_EXPORT AppCacheResponseInfo +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseInfo : public base::RefCounted<AppCacheResponseInfo> { public: // AppCacheResponseInfo takes ownership of the http_info. @@ -55,7 +55,7 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseInfo // A refcounted wrapper for HttpResponseInfo so we can apply the // refcounting semantics used with IOBuffer with these structures too. -struct WEBKIT_STORAGE_EXPORT HttpResponseInfoIOBuffer +struct WEBKIT_STORAGE_BROWSER_EXPORT HttpResponseInfoIOBuffer : public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> { scoped_ptr<net::HttpResponseInfo> http_info; int response_data_size; @@ -69,7 +69,7 @@ struct WEBKIT_STORAGE_EXPORT HttpResponseInfoIOBuffer }; // Low level storage API used by the response reader and writer. -class WEBKIT_STORAGE_EXPORT AppCacheDiskCacheInterface { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCacheInterface { public: class Entry { public: @@ -95,7 +95,7 @@ class WEBKIT_STORAGE_EXPORT AppCacheDiskCacheInterface { }; // Common base class for response reader and writer. -class WEBKIT_STORAGE_EXPORT AppCacheResponseIO { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseIO { public: virtual ~AppCacheResponseIO(); int64 response_id() const { return response_id_; } @@ -131,7 +131,8 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseIO { // and there is a read in progress, the implementation will return // immediately but will take care of any side effect of cancelling the // operation. In other words, instances are safe to delete at will. -class WEBKIT_STORAGE_EXPORT AppCacheResponseReader : public AppCacheResponseIO { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseReader + : public AppCacheResponseIO { public: virtual ~AppCacheResponseReader(); @@ -193,7 +194,8 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseReader : public AppCacheResponseIO { // and there is a write in progress, the implementation will return // immediately but will take care of any side effect of cancelling the // operation. In other words, instances are safe to delete at will. -class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseWriter + : public AppCacheResponseIO { public: virtual ~AppCacheResponseWriter(); diff --git a/webkit/browser/appcache/appcache_service.h b/webkit/browser/appcache/appcache_service.h index a830234..d495ce8 100644 --- a/webkit/browser/appcache/appcache_service.h +++ b/webkit/browser/appcache/appcache_service.h @@ -14,8 +14,8 @@ #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "webkit/browser/appcache/appcache_storage.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" namespace net { class URLRequestContext; @@ -38,7 +38,7 @@ class AppCacheQuotaClient; class AppCachePolicy; // Refcounted container to avoid copying the collection in callbacks. -struct WEBKIT_STORAGE_EXPORT AppCacheInfoCollection +struct WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInfoCollection : public base::RefCountedThreadSafe<AppCacheInfoCollection> { AppCacheInfoCollection(); @@ -52,7 +52,7 @@ struct WEBKIT_STORAGE_EXPORT AppCacheInfoCollection // Class that manages the application cache service. Sends notifications // to many frontends. One instance per user-profile. Each instance has // exclusive access to its cache_directory on disk. -class WEBKIT_STORAGE_EXPORT AppCacheService { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheService { public: // If not using quota management, the proxy may be NULL. explicit AppCacheService(quota::QuotaManagerProxy* quota_manager_proxy); diff --git a/webkit/browser/appcache/appcache_storage.h b/webkit/browser/appcache/appcache_storage.h index eb4df25..5917a41 100644 --- a/webkit/browser/appcache/appcache_storage.h +++ b/webkit/browser/appcache/appcache_storage.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "webkit/browser/appcache/appcache_working_set.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" class GURL; @@ -30,11 +30,11 @@ class AppCacheService; struct AppCacheInfoCollection; struct HttpResponseInfoIOBuffer; -class WEBKIT_STORAGE_EXPORT AppCacheStorage { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheStorage { public: typedef std::map<GURL, int64> UsageMap; - class WEBKIT_STORAGE_EXPORT Delegate { + class WEBKIT_STORAGE_BROWSER_EXPORT Delegate { public: // If retrieval fails, 'collection' will be NULL. virtual void OnAllInfo(AppCacheInfoCollection* collection) {} @@ -319,4 +319,3 @@ class WEBKIT_STORAGE_EXPORT AppCacheStorage { } // namespace appcache #endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_ - diff --git a/webkit/browser/appcache/appcache_storage_impl.h b/webkit/browser/appcache/appcache_storage_impl.h index e4f7466..c705d26 100644 --- a/webkit/browser/appcache/appcache_storage_impl.h +++ b/webkit/browser/appcache/appcache_storage_impl.h @@ -18,7 +18,7 @@ #include "webkit/browser/appcache/appcache_database.h" #include "webkit/browser/appcache/appcache_disk_cache.h" #include "webkit/browser/appcache/appcache_storage.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace content { class ChromeAppCacheServiceTest; @@ -131,7 +131,7 @@ class AppCacheStorageImpl : public AppCacheStorage { const GURL& namespace_entry_url, const AppCacheEntry& fallback_entry, int64 cache_id, int64 group_id, const GURL& manifest_url); - WEBKIT_STORAGE_EXPORT AppCacheDiskCache* disk_cache(); + WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCache* disk_cache(); // The directory in which we place files in the file system. base::FilePath cache_directory_; diff --git a/webkit/browser/appcache/appcache_update_job.h b/webkit/browser/appcache/appcache_update_job.h index f33979e..75b31c8 100644 --- a/webkit/browser/appcache/appcache_update_job.h +++ b/webkit/browser/appcache/appcache_update_job.h @@ -21,15 +21,15 @@ #include "webkit/browser/appcache/appcache_host.h" #include "webkit/browser/appcache/appcache_response.h" #include "webkit/browser/appcache/appcache_storage.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" namespace appcache { class HostNotifier; // Application cache Update algorithm and state. -class WEBKIT_STORAGE_EXPORT AppCacheUpdateJob +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob : public AppCacheStorage::Delegate, public AppCacheHost::Observer { public: diff --git a/webkit/browser/appcache/appcache_url_request_job.h b/webkit/browser/appcache/appcache_url_request_job.h index a2abcea..cb313dc 100644 --- a/webkit/browser/appcache/appcache_url_request_job.h +++ b/webkit/browser/appcache/appcache_url_request_job.h @@ -13,13 +13,13 @@ #include "webkit/browser/appcache/appcache_entry.h" #include "webkit/browser/appcache/appcache_response.h" #include "webkit/browser/appcache/appcache_storage.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { // A net::URLRequestJob derivative that knows how to return a response stored // in the appcache. -class WEBKIT_STORAGE_EXPORT AppCacheURLRequestJob +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheURLRequestJob : public net::URLRequestJob, public AppCacheStorage::Delegate { public: diff --git a/webkit/browser/appcache/appcache_working_set.h b/webkit/browser/appcache/appcache_working_set.h index 199245d..6448d72 100644 --- a/webkit/browser/appcache/appcache_working_set.h +++ b/webkit/browser/appcache/appcache_working_set.h @@ -9,7 +9,7 @@ #include "base/containers/hash_tables.h" #include "googleurl/src/gurl.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace appcache { @@ -19,7 +19,7 @@ class AppCacheResponseInfo; // Represents the working set of appcache object instances // currently in memory. -class WEBKIT_STORAGE_EXPORT AppCacheWorkingSet { +class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheWorkingSet { public: typedef std::map<GURL, AppCacheGroup*> GroupMap; diff --git a/webkit/browser/appcache/manifest_parser.h b/webkit/browser/appcache/manifest_parser.h index ef9e0a6..44661ef 100644 --- a/webkit/browser/appcache/manifest_parser.h +++ b/webkit/browser/appcache/manifest_parser.h @@ -36,14 +36,14 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; namespace appcache { -struct WEBKIT_STORAGE_EXPORT Manifest { +struct WEBKIT_STORAGE_BROWSER_EXPORT Manifest { Manifest(); ~Manifest(); @@ -54,7 +54,7 @@ struct WEBKIT_STORAGE_EXPORT Manifest { bool online_whitelist_all; }; -WEBKIT_STORAGE_EXPORT bool ParseManifest(const GURL& manifest_url, +WEBKIT_STORAGE_BROWSER_EXPORT bool ParseManifest(const GURL& manifest_url, const char* data, int length, Manifest& manifest); diff --git a/webkit/browser/appcache/view_appcache_internals_job.h b/webkit/browser/appcache/view_appcache_internals_job.h index 70dea8e..d247c3e 100644 --- a/webkit/browser/appcache/view_appcache_internals_job.h +++ b/webkit/browser/appcache/view_appcache_internals_job.h @@ -6,7 +6,7 @@ #define WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_ #include "base/basictypes.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace net { class NetworkDelegate; @@ -18,7 +18,7 @@ namespace appcache { class AppCacheService; -class WEBKIT_STORAGE_EXPORT ViewAppCacheInternalsJobFactory { +class WEBKIT_STORAGE_BROWSER_EXPORT ViewAppCacheInternalsJobFactory { public: static net::URLRequestJob* CreateJobForRequest( net::URLRequest* request, diff --git a/webkit/browser/blob/blob_data_handle.h b/webkit/browser/blob/blob_data_handle.h index 6c440f5..25eeefe 100644 --- a/webkit/browser/blob/blob_data_handle.h +++ b/webkit/browser/blob/blob_data_handle.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SequencedTaskRunner; @@ -25,7 +25,7 @@ class BlobStorageContext; // the underlying BlobData and its uuid remain in BlobStorageContext's // collection for the duration. This object has delete semantics and // maybe deleted on any thread. -class WEBKIT_STORAGE_EXPORT BlobDataHandle +class WEBKIT_STORAGE_BROWSER_EXPORT BlobDataHandle : public base::SupportsUserData::Data { public: virtual ~BlobDataHandle(); // Maybe be deleted on any thread. diff --git a/webkit/browser/blob/blob_storage_context.h b/webkit/browser/blob/blob_storage_context.h index 12ac754..c9747ae 100644 --- a/webkit/browser/blob/blob_storage_context.h +++ b/webkit/browser/blob/blob_storage_context.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/blob_data.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -29,7 +29,7 @@ class BlobDataHandle; // and maintains a mapping from blob uuid to the data. The class is single // threaded and should only be used on the IO thread. // In chromium, there is one instance per profile. -class WEBKIT_STORAGE_EXPORT BlobStorageContext +class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext : public base::SupportsWeakPtr<BlobStorageContext> { public: BlobStorageContext(); diff --git a/webkit/browser/blob/blob_storage_controller.h b/webkit/browser/blob/blob_storage_controller.h index ca4075a..1b69748 100644 --- a/webkit/browser/blob/blob_storage_controller.h +++ b/webkit/browser/blob/blob_storage_controller.h @@ -11,8 +11,8 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/process.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/blob_data.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -24,7 +24,7 @@ class Time; namespace webkit_blob { // This class handles the logistics of blob Storage within the browser process. -class WEBKIT_STORAGE_EXPORT BlobStorageController { +class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageController { public: BlobStorageController(); ~BlobStorageController(); diff --git a/webkit/browser/blob/blob_storage_host.h b/webkit/browser/blob/blob_storage_host.h index 529ad99..954c32c 100644 --- a/webkit/browser/blob/blob_storage_host.h +++ b/webkit/browser/blob/blob_storage_host.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/blob_data.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -27,7 +27,7 @@ class BlobStorageContext; // terminates all blob references attibutable to that process go away upon // destruction of the instance. The class is single threaded and should // only be used on the IO thread. -class WEBKIT_STORAGE_EXPORT BlobStorageHost { +class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageHost { public: explicit BlobStorageHost(BlobStorageContext* context); ~BlobStorageHost(); diff --git a/webkit/browser/blob/blob_url_request_job.h b/webkit/browser/blob/blob_url_request_job.h index fd39706..5957288 100644 --- a/webkit/browser/blob/blob_url_request_job.h +++ b/webkit/browser/blob/blob_url_request_job.h @@ -13,8 +13,8 @@ #include "net/http/http_byte_range.h" #include "net/http/http_status_code.h" #include "net/url_request/url_request_job.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/blob_data.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class MessageLoopProxy; @@ -35,7 +35,8 @@ namespace webkit_blob { class FileStreamReader; // A request job that handles reading blob URLs. -class WEBKIT_STORAGE_EXPORT BlobURLRequestJob : public net::URLRequestJob { +class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob + : public net::URLRequestJob { public: BlobURLRequestJob(net::URLRequest* request, net::NetworkDelegate* network_delegate, diff --git a/webkit/browser/blob/blob_url_request_job_factory.h b/webkit/browser/blob/blob_url_request_job_factory.h index 85f1853..2a78c95 100644 --- a/webkit/browser/blob/blob_url_request_job_factory.h +++ b/webkit/browser/blob/blob_url_request_job_factory.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "net/url_request/url_request_job_factory.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class MessageLoopProxy; @@ -27,7 +27,7 @@ namespace webkit_blob { class BlobData; class BlobStorageController; -class WEBKIT_STORAGE_EXPORT BlobProtocolHandler +class WEBKIT_STORAGE_BROWSER_EXPORT BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { public: // |controller|'s lifetime should exceed the lifetime of the ProtocolHandler. diff --git a/webkit/browser/blob/file_stream_reader.h b/webkit/browser/blob/file_stream_reader.h index 9680ba6..dd49a52 100644 --- a/webkit/browser/blob/file_stream_reader.h +++ b/webkit/browser/blob/file_stream_reader.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "net/base/completion_callback.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace net { class IOBuffer; @@ -17,7 +17,7 @@ class IOBuffer; namespace webkit_blob { // A generic interface for reading a file-like object. -class WEBKIT_STORAGE_EXPORT FileStreamReader { +class WEBKIT_STORAGE_BROWSER_EXPORT FileStreamReader { public: // It is valid to delete the reader at any time. If the stream is deleted // while it has a pending read, its callback will not be called. diff --git a/webkit/browser/blob/local_file_stream_reader.h b/webkit/browser/blob/local_file_stream_reader.h index 7a77449..1443385 100644 --- a/webkit/browser/blob/local_file_stream_reader.h +++ b/webkit/browser/blob/local_file_stream_reader.h @@ -12,7 +12,7 @@ #include "base/platform_file.h" #include "base/time.h" #include "webkit/browser/blob/file_stream_reader.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class TaskRunner; @@ -26,7 +26,8 @@ namespace webkit_blob { // A thin wrapper of net::FileStream with range support for sliced file // handling. -class WEBKIT_STORAGE_EXPORT LocalFileStreamReader : public FileStreamReader { +class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamReader + : public FileStreamReader { public: // Creates a new FileReader for a local file |file_path|. // |initial_offset| specifies the offset in the file where the first read diff --git a/webkit/browser/blob/view_blob_internals_job.h b/webkit/browser/blob/view_blob_internals_job.h index ad6421f..41687d9 100644 --- a/webkit/browser/blob/view_blob_internals_job.h +++ b/webkit/browser/blob/view_blob_internals_job.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "net/url_request/url_request_simple_job.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace net { class URLRequest; @@ -22,7 +22,7 @@ class BlobStorageController; // A job subclass that implements a protocol to inspect the internal // state of blob registry. -class WEBKIT_STORAGE_EXPORT ViewBlobInternalsJob +class WEBKIT_STORAGE_BROWSER_EXPORT ViewBlobInternalsJob : public net::URLRequestSimpleJob { public: ViewBlobInternalsJob(net::URLRequest* request, diff --git a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h index 0df64b5..279cc4f 100644 --- a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h +++ b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h @@ -15,8 +15,8 @@ #include "base/synchronization/lock.h" #include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/browser/quota/special_storage_policy.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace fileapi { class AsyncFileUtilAdapter; @@ -63,7 +63,7 @@ class FileAccessPermissions; // // filesystem:<origin>/external/<mount_name>/... // -class WEBKIT_STORAGE_EXPORT CrosMountPointProvider +class WEBKIT_STORAGE_BROWSER_EXPORT CrosMountPointProvider : public fileapi::ExternalFileSystemMountPointProvider { public: using fileapi::FileSystemMountPointProvider::OpenFileSystemCallback; diff --git a/webkit/browser/chromeos/fileapi/file_access_permissions.h b/webkit/browser/chromeos/fileapi/file_access_permissions.h index 31cf195..6af1ddd 100644 --- a/webkit/browser/chromeos/fileapi/file_access_permissions.h +++ b/webkit/browser/chromeos/fileapi/file_access_permissions.h @@ -11,11 +11,11 @@ #include "base/files/file_path.h" #include "base/synchronization/lock.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace chromeos { -class WEBKIT_STORAGE_EXPORT FileAccessPermissions { +class WEBKIT_STORAGE_BROWSER_EXPORT FileAccessPermissions { public: FileAccessPermissions(); virtual ~FileAccessPermissions(); diff --git a/webkit/browser/database/database_quota_client.h b/webkit/browser/database/database_quota_client.h index 0239b5d..bc070213 100644 --- a/webkit/browser/database/database_quota_client.h +++ b/webkit/browser/database/database_quota_client.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop_proxy.h" #include "webkit/browser/quota/quota_client.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace webkit_database { @@ -21,7 +21,7 @@ class DatabaseTracker; // A QuotaClient implementation to integrate WebSQLDatabases // with the quota management system. This interface is used // on the IO thread by the quota manager. -class WEBKIT_STORAGE_EXPORT_PRIVATE DatabaseQuotaClient +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseQuotaClient : public quota::QuotaClient { public: DatabaseQuotaClient( diff --git a/webkit/browser/database/database_tracker.h b/webkit/browser/database/database_tracker.h index 4a07c39..0e033ab 100644 --- a/webkit/browser/database/database_tracker.h +++ b/webkit/browser/database/database_tracker.h @@ -19,8 +19,8 @@ #include "base/strings/string_util.h" #include "base/time.h" #include "net/base/completion_callback.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/database/database_connections.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class MessageLoopProxy; @@ -38,15 +38,15 @@ class SpecialStoragePolicy; namespace webkit_database { -WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType +WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType kDatabaseDirectoryName[]; -WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType +WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType kTrackerDatabaseFileName[]; class DatabasesTable; // This class is used to store information about all databases in an origin. -class WEBKIT_STORAGE_EXPORT OriginInfo { +class WEBKIT_STORAGE_BROWSER_EXPORT OriginInfo { public: OriginInfo(); OriginInfo(const OriginInfo& origin_info); @@ -80,7 +80,7 @@ class WEBKIT_STORAGE_EXPORT OriginInfo { // the disk. Therefore, in a multi-threaded application, all methods of this // class should be called on the thread dedicated to file operations (file // thread in the browser process, for example), if such a thread exists. -class WEBKIT_STORAGE_EXPORT DatabaseTracker +class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker : public base::RefCountedThreadSafe<DatabaseTracker> { public: class Observer { diff --git a/webkit/browser/database/database_util.h b/webkit/browser/database/database_util.h index bf037f9..b16e671 100644 --- a/webkit/browser/database/database_util.h +++ b/webkit/browser/database/database_util.h @@ -7,7 +7,7 @@ #include "base/strings/string16.h" #include "googleurl/src/gurl.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -17,7 +17,7 @@ namespace webkit_database { class DatabaseTracker; -class WEBKIT_STORAGE_EXPORT DatabaseUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseUtil { public: static const char kJournalFileSuffix[]; diff --git a/webkit/browser/database/databases_table.h b/webkit/browser/database/databases_table.h index 126745e..7546773 100644 --- a/webkit/browser/database/databases_table.h +++ b/webkit/browser/database/databases_table.h @@ -8,7 +8,7 @@ #include <vector> #include "base/strings/string16.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace sql { class Connection; @@ -16,7 +16,7 @@ class Connection; namespace webkit_database { -struct WEBKIT_STORAGE_EXPORT_PRIVATE DatabaseDetails { +struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseDetails { DatabaseDetails(); ~DatabaseDetails(); @@ -26,7 +26,7 @@ struct WEBKIT_STORAGE_EXPORT_PRIVATE DatabaseDetails { int64 estimated_size; }; -class WEBKIT_STORAGE_EXPORT_PRIVATE DatabasesTable { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabasesTable { public: explicit DatabasesTable(sql::Connection* db) : db_(db) { } diff --git a/webkit/browser/database/vfs_backend.h b/webkit/browser/database/vfs_backend.h index a47b8cf..d81433c 100644 --- a/webkit/browser/database/vfs_backend.h +++ b/webkit/browser/database/vfs_backend.h @@ -8,7 +8,7 @@ #include "base/platform_file.h" #include "base/process.h" #include "base/strings/string16.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -16,7 +16,7 @@ class FilePath; namespace webkit_database { -class WEBKIT_STORAGE_EXPORT VfsBackend { +class WEBKIT_STORAGE_BROWSER_EXPORT VfsBackend { public: static void OpenFile(const base::FilePath& file_path, int desired_flags, diff --git a/webkit/browser/dom_storage/dom_storage_area.h b/webkit/browser/dom_storage/dom_storage_area.h index fdd7fa2..b243abb 100644 --- a/webkit/browser/dom_storage/dom_storage_area.h +++ b/webkit/browser/dom_storage/dom_storage_area.h @@ -12,8 +12,8 @@ #include "base/nullable_string16.h" #include "base/strings/string16.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace dom_storage { @@ -25,7 +25,7 @@ class SessionStorageDatabase; // Container for a per-origin Map of key/value pairs potentially // backed by storage on disk and lazily commits changes to disk. // See class comments for DomStorageContext for a larger overview. -class WEBKIT_STORAGE_EXPORT DomStorageArea +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageArea : public base::RefCountedThreadSafe<DomStorageArea> { public: diff --git a/webkit/browser/dom_storage/dom_storage_context.h b/webkit/browser/dom_storage/dom_storage_context.h index 424f273..8bc972c 100644 --- a/webkit/browser/dom_storage/dom_storage_context.h +++ b/webkit/browser/dom_storage/dom_storage_context.h @@ -17,7 +17,7 @@ #include "base/observer_list.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" class NullableString16; @@ -59,7 +59,7 @@ struct SessionStorageUsageInfo; // Classes intended to be used by an embedder are DomStorageContext, // DomStorageHost, and DomStorageSession. The other classes are for // internal consumption. -class WEBKIT_STORAGE_EXPORT DomStorageContext +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageContext : public base::RefCountedThreadSafe<DomStorageContext> { public: // An interface for observing Local and Session Storage events on the diff --git a/webkit/browser/dom_storage/dom_storage_database.h b/webkit/browser/dom_storage/dom_storage_database.h index c451e90..1e3b658 100644 --- a/webkit/browser/dom_storage/dom_storage_database.h +++ b/webkit/browser/dom_storage/dom_storage_database.h @@ -13,14 +13,14 @@ #include "base/nullable_string16.h" #include "base/strings/string16.h" #include "sql/connection.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace dom_storage { // Represents a SQLite based backing for DOM storage data. This // class is designed to be used on a single thread. -class WEBKIT_STORAGE_EXPORT DomStorageDatabase { +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageDatabase { public: static base::FilePath GetJournalFilePath(const base::FilePath& database_path); diff --git a/webkit/browser/dom_storage/dom_storage_database_adapter.h b/webkit/browser/dom_storage/dom_storage_database_adapter.h index a1daeb6..360e6bd 100644 --- a/webkit/browser/dom_storage/dom_storage_database_adapter.h +++ b/webkit/browser/dom_storage/dom_storage_database_adapter.h @@ -9,12 +9,12 @@ // the per-origin DomStorageDatabases for localStorage and // SessionStorageDatabase which stores multiple origins. +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace dom_storage { -class WEBKIT_STORAGE_EXPORT DomStorageDatabaseAdapter { +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageDatabaseAdapter { public: virtual ~DomStorageDatabaseAdapter() {} virtual void ReadAllValues(ValuesMap* result) = 0; diff --git a/webkit/browser/dom_storage/dom_storage_host.h b/webkit/browser/dom_storage/dom_storage_host.h index 7dd1eab..0454c66 100644 --- a/webkit/browser/dom_storage/dom_storage_host.h +++ b/webkit/browser/dom_storage/dom_storage_host.h @@ -10,8 +10,8 @@ #include "base/memory/ref_counted.h" #include "base/nullable_string16.h" #include "base/strings/string16.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -27,7 +27,7 @@ class DomStorageArea; // This class is single threaded, and performs blocking file reads/writes, // so it shouldn't be used on chrome's IO thread. // See class comments for DomStorageContext for a larger overview. -class WEBKIT_STORAGE_EXPORT DomStorageHost { +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageHost { public: explicit DomStorageHost(DomStorageContext* context); ~DomStorageHost(); diff --git a/webkit/browser/dom_storage/dom_storage_namespace.h b/webkit/browser/dom_storage/dom_storage_namespace.h index ad03b98..758ca2ee 100644 --- a/webkit/browser/dom_storage/dom_storage_namespace.h +++ b/webkit/browser/dom_storage/dom_storage_namespace.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" class GURL; @@ -22,7 +22,7 @@ class SessionStorageDatabase; // Container for the set of per-origin Areas. // See class comments for DomStorageContext for a larger overview. -class WEBKIT_STORAGE_EXPORT DomStorageNamespace +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageNamespace : public base::RefCountedThreadSafe<DomStorageNamespace> { public: // Option for PurgeMemory. diff --git a/webkit/browser/dom_storage/dom_storage_session.h b/webkit/browser/dom_storage/dom_storage_session.h index 7d9b3d0..b500859 100644 --- a/webkit/browser/dom_storage/dom_storage_session.h +++ b/webkit/browser/dom_storage/dom_storage_session.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace dom_storage { @@ -19,7 +19,7 @@ class DomStorageContext; // storage namespace and provides an interface to Clone() an // existing session storage namespace. It may be used on any thread. // See class comments for DomStorageContext for a larger overview. -class WEBKIT_STORAGE_EXPORT DomStorageSession +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageSession : public base::RefCountedThreadSafe<DomStorageSession> { public: // Constructs a |DomStorageSession| and allocates new IDs for it. diff --git a/webkit/browser/dom_storage/dom_storage_task_runner.h b/webkit/browser/dom_storage/dom_storage_task_runner.h index c3d71d5..5460a51 100644 --- a/webkit/browser/dom_storage/dom_storage_task_runner.h +++ b/webkit/browser/dom_storage/dom_storage_task_runner.h @@ -9,7 +9,7 @@ #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class MessageLoopProxy; @@ -26,7 +26,8 @@ namespace dom_storage { // TODO(michaeln): Skip tasks for reading during shutdown. // * Internal tasks related to committing changes to disk are performed as // shutdown-blocking commit sequence tasks. -class WEBKIT_STORAGE_EXPORT DomStorageTaskRunner : public base::TaskRunner { +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageTaskRunner + : public base::TaskRunner { public: enum SequenceID { PRIMARY_SEQUENCE, @@ -66,7 +67,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageTaskRunner : public base::TaskRunner { // A derived class used in chromium that utilizes a SequenceWorkerPool // under dom_storage specific SequenceTokens. The |delayed_task_loop| // is used to delay scheduling on the worker pool. -class WEBKIT_STORAGE_EXPORT DomStorageWorkerPoolTaskRunner : +class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageWorkerPoolTaskRunner : public DomStorageTaskRunner { public: DomStorageWorkerPoolTaskRunner( @@ -105,7 +106,7 @@ class WEBKIT_STORAGE_EXPORT DomStorageWorkerPoolTaskRunner : // There is no distinction between [non]-shutdown-blocking or // the primary sequence vs the commit sequence in the mock, // all tasks are scheduled on |message_loop| with zero delay. -class WEBKIT_STORAGE_EXPORT MockDomStorageTaskRunner : +class WEBKIT_STORAGE_BROWSER_EXPORT MockDomStorageTaskRunner : public DomStorageTaskRunner { public: explicit MockDomStorageTaskRunner(base::MessageLoopProxy* message_loop); diff --git a/webkit/browser/dom_storage/local_storage_database_adapter.h b/webkit/browser/dom_storage/local_storage_database_adapter.h index 3f48e05..7cdabf4 100644 --- a/webkit/browser/dom_storage/local_storage_database_adapter.h +++ b/webkit/browser/dom_storage/local_storage_database_adapter.h @@ -8,7 +8,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "webkit/browser/dom_storage/dom_storage_database_adapter.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -18,7 +18,7 @@ namespace dom_storage { class DomStorageDatabase; -class WEBKIT_STORAGE_EXPORT LocalStorageDatabaseAdapter : +class WEBKIT_STORAGE_BROWSER_EXPORT LocalStorageDatabaseAdapter : public DomStorageDatabaseAdapter { public: explicit LocalStorageDatabaseAdapter(const base::FilePath& path); diff --git a/webkit/browser/dom_storage/session_storage_database.h b/webkit/browser/dom_storage/session_storage_database.h index efdbfa9..c442504 100644 --- a/webkit/browser/dom_storage/session_storage_database.h +++ b/webkit/browser/dom_storage/session_storage_database.h @@ -13,8 +13,8 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "third_party/leveldatabase/src/include/leveldb/status.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -33,7 +33,7 @@ namespace dom_storage { // Only one thread is allowed to call the public functions other than // ReadAreaValues and ReadNamespacesAndOrigins. Other threads are allowed to // call ReadAreaValues and ReadNamespacesAndOrigins. -class WEBKIT_STORAGE_EXPORT SessionStorageDatabase : +class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase : public base::RefCountedThreadSafe<SessionStorageDatabase> { public: explicit SessionStorageDatabase(const base::FilePath& file_path); diff --git a/webkit/browser/fileapi/async_file_util.h b/webkit/browser/fileapi/async_file_util.h index 847adcff..97b6590 100644 --- a/webkit/browser/fileapi/async_file_util.h +++ b/webkit/browser/fileapi/async_file_util.h @@ -10,8 +10,8 @@ #include "base/files/file_util_proxy.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/directory_entry.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class Time; @@ -38,7 +38,7 @@ class FileSystemURL; // alive while FileSystemOperationContext given to each operation is kept // alive. (Note that this instance might be freed on different thread // from the thread it is created.) -class WEBKIT_STORAGE_EXPORT AsyncFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT AsyncFileUtil { public: typedef base::Callback< void(base::PlatformFileError result)> StatusCallback; diff --git a/webkit/browser/fileapi/async_file_util_adapter.h b/webkit/browser/fileapi/async_file_util_adapter.h index 0c6fcbd..1900027 100644 --- a/webkit/browser/fileapi/async_file_util_adapter.h +++ b/webkit/browser/fileapi/async_file_util_adapter.h @@ -22,7 +22,7 @@ class FileSystemFileUtil; // // This instance (as thus this->sync_file_util_) is guaranteed to be alive // as far as FileSystemOperationContext given to each operation is kept alive. -class WEBKIT_STORAGE_EXPORT_PRIVATE AsyncFileUtilAdapter +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE AsyncFileUtilAdapter : public AsyncFileUtil { public: // Creates a new AsyncFileUtil for |sync_file_util|. This takes the diff --git a/webkit/browser/fileapi/copy_or_move_file_validator.h b/webkit/browser/fileapi/copy_or_move_file_validator.h index b60d332..9b32f5b 100644 --- a/webkit/browser/fileapi/copy_or_move_file_validator.h +++ b/webkit/browser/fileapi/copy_or_move_file_validator.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/platform_file.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -17,7 +17,7 @@ namespace fileapi { class FileSystemURL; -class WEBKIT_STORAGE_EXPORT CopyOrMoveFileValidator { +class WEBKIT_STORAGE_BROWSER_EXPORT CopyOrMoveFileValidator { public: // Callback that is invoked when validation completes. A result of // base::PLATFORM_FILE_OK means the file validated. diff --git a/webkit/browser/fileapi/external_mount_points.h b/webkit/browser/fileapi/external_mount_points.h index 5a045c1..9b48dff 100644 --- a/webkit/browser/fileapi/external_mount_points.h +++ b/webkit/browser/fileapi/external_mount_points.h @@ -12,8 +12,8 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "webkit/browser/fileapi/mount_points.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class FilePath; @@ -32,7 +32,7 @@ namespace fileapi { // // filesystem:<origin>/external/<mount_name>/relative/path // -class WEBKIT_STORAGE_EXPORT ExternalMountPoints +class WEBKIT_STORAGE_BROWSER_EXPORT ExternalMountPoints : public base::RefCountedThreadSafe<ExternalMountPoints>, public MountPoints { public: @@ -155,7 +155,7 @@ class WEBKIT_STORAGE_EXPORT ExternalMountPoints }; // Registers a scoped external filesystem which gets revoked when it scopes out. -class WEBKIT_STORAGE_EXPORT ScopedExternalFileSystem { +class WEBKIT_STORAGE_BROWSER_EXPORT ScopedExternalFileSystem { public: ScopedExternalFileSystem(const std::string& mount_name, FileSystemType type, diff --git a/webkit/browser/fileapi/file_observers.h b/webkit/browser/fileapi/file_observers.h index 873156f..c791503 100644 --- a/webkit/browser/fileapi/file_observers.h +++ b/webkit/browser/fileapi/file_observers.h @@ -6,7 +6,7 @@ #define WEBKIT_BROWSER_FILEAPI_FILE_OBSERVERS_H_ #include "base/basictypes.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" // TODO(kinuko): Split this file into per-observer multiple files. @@ -27,7 +27,7 @@ class FileSystemURL; // // OnUpdate() is called each time the |url| is updated but works only for // sandboxed files (where usage is tracked). -class WEBKIT_STORAGE_EXPORT FileUpdateObserver { +class WEBKIT_STORAGE_BROWSER_EXPORT FileUpdateObserver { public: FileUpdateObserver() {} virtual ~FileUpdateObserver() {} @@ -44,7 +44,7 @@ class WEBKIT_STORAGE_EXPORT FileUpdateObserver { // OnAccess is called whenever an operation reads file contents or metadata. // (It is called only once per operation regardless of whether the operation // is recursive or not) -class WEBKIT_STORAGE_EXPORT FileAccessObserver { +class WEBKIT_STORAGE_BROWSER_EXPORT FileAccessObserver { public: FileAccessObserver() {} virtual ~FileAccessObserver() {} @@ -60,7 +60,7 @@ class WEBKIT_STORAGE_EXPORT FileAccessObserver { // removed or modified. For recursive operations each method is called for // each subdirectory/subfile. Currently ChangeObserver is only supported // by the local sandbox file system. -class WEBKIT_STORAGE_EXPORT FileChangeObserver { +class WEBKIT_STORAGE_BROWSER_EXPORT FileChangeObserver { public: FileChangeObserver() {} virtual ~FileChangeObserver() {} diff --git a/webkit/browser/fileapi/file_permission_policy.h b/webkit/browser/fileapi/file_permission_policy.h index baecbb1..3e56544 100644 --- a/webkit/browser/fileapi/file_permission_policy.h +++ b/webkit/browser/fileapi/file_permission_policy.h @@ -5,14 +5,14 @@ #ifndef WEBKIT_BROWSER_FILEAPI_FILE_PERMISSION_POLICY_H_ #define WEBKIT_BROWSER_FILEAPI_FILE_PERMISSION_POLICY_H_ -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { -WEBKIT_STORAGE_EXPORT extern const int kReadFilePermissions; -WEBKIT_STORAGE_EXPORT extern const int kWriteFilePermissions; -WEBKIT_STORAGE_EXPORT extern const int kCreateFilePermissions; -WEBKIT_STORAGE_EXPORT extern const int kOpenFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kReadFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kWriteFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kCreateFilePermissions; +WEBKIT_STORAGE_BROWSER_EXPORT extern const int kOpenFilePermissions; enum FilePermissionPolicy { // Any access should be always denied. diff --git a/webkit/browser/fileapi/file_stream_writer.h b/webkit/browser/fileapi/file_stream_writer.h index fe79a24..7262cdf 100644 --- a/webkit/browser/fileapi/file_stream_writer.h +++ b/webkit/browser/fileapi/file_stream_writer.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "net/base/completion_callback.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace net { class IOBuffer; @@ -16,7 +16,7 @@ class IOBuffer; namespace fileapi { // A generic interface for writing to a file-like object. -class WEBKIT_STORAGE_EXPORT_PRIVATE FileStreamWriter { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileStreamWriter { public: // Closes the file. If there's an in-flight operation, it is canceled (i.e., // the callback function associated with the operation is not called). diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h index 546e32a..a35acee5 100644 --- a/webkit/browser/fileapi/file_system_context.h +++ b/webkit/browser/fileapi/file_system_context.h @@ -18,8 +18,8 @@ #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/open_file_system_mode.h" #include "webkit/browser/fileapi/task_runner_bound_observer_list.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class FilePath; @@ -67,7 +67,7 @@ struct DefaultContextDeleter; // This class keeps and provides a file system context for FileSystem API. // An instance of this class is created and owned by profile. -class WEBKIT_STORAGE_EXPORT FileSystemContext +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext : public base::RefCountedThreadSafe<FileSystemContext, DefaultContextDeleter> { public: diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.h b/webkit/browser/fileapi/file_system_dir_url_request_job.h index fd7dfd3..933550e 100644 --- a/webkit/browser/fileapi/file_system_dir_url_request_job.h +++ b/webkit/browser/fileapi/file_system_dir_url_request_job.h @@ -14,7 +14,7 @@ #include "base/platform_file.h" #include "net/url_request/url_request_job.h" #include "webkit/browser/fileapi/file_system_url.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { @@ -22,7 +22,7 @@ class FileSystemContext; struct DirectoryEntry; // A request job that handles reading filesystem: URLs for directories. -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemDirURLRequestJob +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemDirURLRequestJob : public net::URLRequestJob { public: FileSystemDirURLRequestJob( diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h index 348f3d8..eef8986 100644 --- a/webkit/browser/fileapi/file_system_file_stream_reader.h +++ b/webkit/browser/fileapi/file_system_file_stream_reader.h @@ -11,8 +11,8 @@ #include "base/time.h" #include "webkit/browser/blob/file_stream_reader.h" #include "webkit/browser/fileapi/file_system_url.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class FilePath; @@ -31,7 +31,7 @@ class FileSystemContext; // filesystems but remote filesystem should implement its own reader // rather than relying on FileSystemOperation::GetSnapshotFile() which // may force downloading the entire contents for remote files. -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemFileStreamReader +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader : public webkit_blob::FileStreamReader { public: // Creates a new FileReader for a filesystem URL |url| form |initial_offset|. diff --git a/webkit/browser/fileapi/file_system_file_util.h b/webkit/browser/fileapi/file_system_file_util.h index 0623b46..13ea0e4 100644 --- a/webkit/browser/fileapi/file_system_file_util.h +++ b/webkit/browser/fileapi/file_system_file_util.h @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/scoped_file.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class Time; @@ -25,10 +25,10 @@ class FileSystemURL; // // Layering structure of the FileSystemFileUtil was split out. // See http://crbug.com/128136 if you need it. -class WEBKIT_STORAGE_EXPORT FileSystemFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemFileUtil { public: // It will be implemented by each subclass such as FileSystemFileEnumerator. - class WEBKIT_STORAGE_EXPORT AbstractFileEnumerator { + class WEBKIT_STORAGE_BROWSER_EXPORT AbstractFileEnumerator { public: virtual ~AbstractFileEnumerator() {} @@ -44,7 +44,7 @@ class WEBKIT_STORAGE_EXPORT FileSystemFileUtil { virtual bool IsDirectory() = 0; }; - class WEBKIT_STORAGE_EXPORT EmptyFileEnumerator + class WEBKIT_STORAGE_BROWSER_EXPORT EmptyFileEnumerator : public AbstractFileEnumerator { virtual base::FilePath Next() OVERRIDE; virtual int64 Size() OVERRIDE; diff --git a/webkit/browser/fileapi/file_system_mount_point_provider.h b/webkit/browser/fileapi/file_system_mount_point_provider.h index 83511c2..f1a05b7 100644 --- a/webkit/browser/fileapi/file_system_mount_point_provider.h +++ b/webkit/browser/fileapi/file_system_mount_point_provider.h @@ -14,8 +14,8 @@ #include "base/platform_file.h" #include "webkit/browser/fileapi/file_permission_policy.h" #include "webkit/browser/fileapi/open_file_system_mode.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -41,7 +41,7 @@ class RemoteFileSystemProxyInterface; // NOTE: when you implement a new MountPointProvider for your own // FileSystem module, please contact to kinuko@chromium.org. // -class WEBKIT_STORAGE_EXPORT FileSystemMountPointProvider { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemMountPointProvider { public: // Callback for OpenFileSystem. typedef base::Callback<void(base::PlatformFileError error)> diff --git a/webkit/browser/fileapi/file_system_operation_context.h b/webkit/browser/fileapi/file_system_operation_context.h index baee852..866ce69 100644 --- a/webkit/browser/fileapi/file_system_operation_context.h +++ b/webkit/browser/fileapi/file_system_operation_context.h @@ -9,8 +9,8 @@ #include "base/supports_user_data.h" #include "base/threading/thread_checker.h" #include "webkit/browser/fileapi/task_runner_bound_observer_list.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class SequencedTaskRunner; @@ -26,7 +26,7 @@ class FileSystemContext; // the same context (e.g. use the same task runner, share the quota etc). // Note that the remaining quota bytes (allowed_bytes_growth) may be // updated during the execution of write operations. -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemOperationContext +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext : public base::SupportsUserData { public: explicit FileSystemOperationContext(FileSystemContext* context); diff --git a/webkit/browser/fileapi/file_system_operation_runner.h b/webkit/browser/fileapi/file_system_operation_runner.h index 41e3300..acd505c 100644 --- a/webkit/browser/fileapi/file_system_operation_runner.h +++ b/webkit/browser/fileapi/file_system_operation_runner.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/browser/fileapi/file_system_url.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { @@ -33,7 +33,7 @@ class FileSystemContext; // by filesystems which implement LocalFileSystemOperation. // If they are called on other filesystems // base::PLATFORM_FILE_ERROR_INVALID_OPERATION is returned via callback. -class WEBKIT_STORAGE_EXPORT FileSystemOperationRunner +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationRunner : public base::SupportsWeakPtr<FileSystemOperationRunner> { public: typedef FileSystemOperation::GetMetadataCallback GetMetadataCallback; diff --git a/webkit/browser/fileapi/file_system_options.h b/webkit/browser/fileapi/file_system_options.h index 27cc9d2..b6e78ef 100644 --- a/webkit/browser/fileapi/file_system_options.h +++ b/webkit/browser/fileapi/file_system_options.h @@ -8,13 +8,13 @@ #include <string> #include <vector> -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { // Provides runtime options that may change FileSystem API behavior. // This object is copyable. -class WEBKIT_STORAGE_EXPORT FileSystemOptions { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOptions { public: enum ProfileMode { PROFILE_MODE_NORMAL = 0, diff --git a/webkit/browser/fileapi/file_system_quota_client.h b/webkit/browser/fileapi/file_system_quota_client.h index 7154b41..f216804 100644 --- a/webkit/browser/fileapi/file_system_quota_client.h +++ b/webkit/browser/fileapi/file_system_quota_client.h @@ -15,8 +15,8 @@ #include "base/memory/ref_counted.h" #include "webkit/browser/fileapi/file_system_quota_util.h" #include "webkit/browser/quota/quota_client.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class SequencedTaskRunner; @@ -31,7 +31,7 @@ class FileSystemContext; // is called. // All of the public methods of this class are called by the quota manager // (except for the constructor/destructor). -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemQuotaClient +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemQuotaClient : public NON_EXPORTED_BASE(quota::QuotaClient) { public: FileSystemQuotaClient( diff --git a/webkit/browser/fileapi/file_system_quota_util.h b/webkit/browser/fileapi/file_system_quota_util.h index 0b3ce91..64776e3 100644 --- a/webkit/browser/fileapi/file_system_quota_util.h +++ b/webkit/browser/fileapi/file_system_quota_util.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class SequencedTaskRunner; @@ -29,7 +29,7 @@ class FileSystemContext; // for file_system_quota_client. // All the methods of this class are synchronous and need to be called on // the thread that the method name implies. -class WEBKIT_STORAGE_EXPORT FileSystemQuotaUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemQuotaUtil { public: virtual ~FileSystemQuotaUtil() {} diff --git a/webkit/browser/fileapi/file_system_task_runners.h b/webkit/browser/fileapi/file_system_task_runners.h index dea61fe..33a43b8 100644 --- a/webkit/browser/fileapi/file_system_task_runners.h +++ b/webkit/browser/fileapi/file_system_task_runners.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SingleThreadTaskRunner; @@ -16,7 +16,7 @@ class SingleThreadTaskRunner; namespace fileapi { // This class holds task runners used for filesystem related stuff. -class WEBKIT_STORAGE_EXPORT FileSystemTaskRunners { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemTaskRunners { public: FileSystemTaskRunners( base::SingleThreadTaskRunner* io_task_runner, diff --git a/webkit/browser/fileapi/file_system_url.h b/webkit/browser/fileapi/file_system_url.h index aa94316..8f08116 100644 --- a/webkit/browser/fileapi/file_system_url.h +++ b/webkit/browser/fileapi/file_system_url.h @@ -10,8 +10,8 @@ #include "base/platform_file.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace fileapi { @@ -74,7 +74,7 @@ namespace fileapi { // illegal on the current platform. // To avoid problems, use VirtualPath::BaseName and // VirtualPath::GetComponents instead of the base::FilePath methods. -class WEBKIT_STORAGE_EXPORT FileSystemURL { +class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemURL { public: FileSystemURL(); ~FileSystemURL(); @@ -127,7 +127,7 @@ class WEBKIT_STORAGE_EXPORT FileSystemURL { bool operator==(const FileSystemURL& that) const; - struct WEBKIT_STORAGE_EXPORT Comparator { + struct WEBKIT_STORAGE_BROWSER_EXPORT Comparator { bool operator() (const FileSystemURL& lhs, const FileSystemURL& rhs) const; }; diff --git a/webkit/browser/fileapi/file_system_url_request_job.h b/webkit/browser/fileapi/file_system_url_request_job.h index c372fa8..1be5833 100644 --- a/webkit/browser/fileapi/file_system_url_request_job.h +++ b/webkit/browser/fileapi/file_system_url_request_job.h @@ -14,7 +14,7 @@ #include "net/http/http_byte_range.h" #include "net/url_request/url_request_job.h" #include "webkit/browser/fileapi/file_system_url.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" class GURL; @@ -30,7 +30,7 @@ namespace fileapi { class FileSystemContext; // A request job that handles reading filesystem: URLs -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemURLRequestJob +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob : public net::URLRequestJob { public: FileSystemURLRequestJob( diff --git a/webkit/browser/fileapi/file_system_url_request_job_factory.h b/webkit/browser/fileapi/file_system_url_request_job_factory.h index fc7bcea..5bd3c0f 100644 --- a/webkit/browser/fileapi/file_system_url_request_job_factory.h +++ b/webkit/browser/fileapi/file_system_url_request_job_factory.h @@ -7,7 +7,7 @@ #include "net/url_request/url_request_job_factory.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class MessageLoopProxy; @@ -20,7 +20,7 @@ class FileSystemContext; // |context|'s lifetime should exceed the lifetime of the ProtocolHandler. // Currently, this is only used by ProfileIOData which owns |context| and the // ProtocolHandler. -WEBKIT_STORAGE_EXPORT net::URLRequestJobFactory::ProtocolHandler* +WEBKIT_STORAGE_BROWSER_EXPORT net::URLRequestJobFactory::ProtocolHandler* CreateFileSystemProtocolHandler(FileSystemContext* context); } // namespace fileapi diff --git a/webkit/browser/fileapi/file_system_usage_cache.h b/webkit/browser/fileapi/file_system_usage_cache.h index 00c3043..b4d8464 100644 --- a/webkit/browser/fileapi/file_system_usage_cache.h +++ b/webkit/browser/fileapi/file_system_usage_cache.h @@ -13,13 +13,13 @@ #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "base/sequenced_task_runner.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class TimedTaskHelper; -class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemUsageCache { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemUsageCache { public: explicit FileSystemUsageCache(base::SequencedTaskRunner* task_runner); ~FileSystemUsageCache(); diff --git a/webkit/browser/fileapi/file_writer_delegate.h b/webkit/browser/fileapi/file_writer_delegate.h index 8e4b028..4af6fde 100644 --- a/webkit/browser/fileapi/file_writer_delegate.h +++ b/webkit/browser/fileapi/file_writer_delegate.h @@ -13,13 +13,13 @@ #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/url_request/url_request.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileStreamWriter; -class WEBKIT_STORAGE_EXPORT_PRIVATE FileWriterDelegate +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileWriterDelegate : public net::URLRequest::Delegate, public base::SupportsWeakPtr<FileWriterDelegate> { public: diff --git a/webkit/browser/fileapi/isolated_context.h b/webkit/browser/fileapi/isolated_context.h index fc637b2..6b3f85a 100644 --- a/webkit/browser/fileapi/isolated_context.h +++ b/webkit/browser/fileapi/isolated_context.h @@ -16,8 +16,8 @@ #include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "webkit/browser/fileapi/mount_points.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace fileapi { class FileSystemURL; @@ -37,9 +37,9 @@ namespace fileapi { // // Some methods of this class are virtual just for mocking. // -class WEBKIT_STORAGE_EXPORT IsolatedContext : public MountPoints { +class WEBKIT_STORAGE_BROWSER_EXPORT IsolatedContext : public MountPoints { public: - class WEBKIT_STORAGE_EXPORT FileInfoSet { + class WEBKIT_STORAGE_BROWSER_EXPORT FileInfoSet { public: FileInfoSet(); ~FileInfoSet(); diff --git a/webkit/browser/fileapi/isolated_file_util.h b/webkit/browser/fileapi/isolated_file_util.h index 8945be0..e6f5955 100644 --- a/webkit/browser/fileapi/isolated_file_util.h +++ b/webkit/browser/fileapi/isolated_file_util.h @@ -7,13 +7,14 @@ #include "base/memory/scoped_ptr.h" #include "webkit/browser/fileapi/local_file_util.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileSystemOperationContext; -class WEBKIT_STORAGE_EXPORT_PRIVATE IsolatedFileUtil : public LocalFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE IsolatedFileUtil + : public LocalFileUtil { public: IsolatedFileUtil(); virtual ~IsolatedFileUtil() {} @@ -28,7 +29,8 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE IsolatedFileUtil : public LocalFileUtil { // Dragged file system is a specialized IsolatedFileUtil where read access to // the virtual root directory (i.e. empty cracked path case) is allowed // and single isolated context may be associated with multiple file paths. -class WEBKIT_STORAGE_EXPORT_PRIVATE DraggedFileUtil : public IsolatedFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DraggedFileUtil + : public IsolatedFileUtil { public: DraggedFileUtil(); virtual ~DraggedFileUtil() {} diff --git a/webkit/browser/fileapi/local_file_stream_writer.h b/webkit/browser/fileapi/local_file_stream_writer.h index ed3ee68..2d08d436 100644 --- a/webkit/browser/fileapi/local_file_stream_writer.h +++ b/webkit/browser/fileapi/local_file_stream_writer.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "webkit/browser/fileapi/file_stream_writer.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace net { class FileStream; @@ -23,7 +23,7 @@ class FileStream; namespace fileapi { // This class is a thin wrapper around net::FileStream for writing local files. -class WEBKIT_STORAGE_EXPORT_PRIVATE LocalFileStreamWriter +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE LocalFileStreamWriter : public FileStreamWriter { public: // Create a writer for the existing file in the path |file_path| starting from diff --git a/webkit/browser/fileapi/local_file_system_operation.h b/webkit/browser/fileapi/local_file_system_operation.h index afb96b3..4d1cbf2 100644 --- a/webkit/browser/fileapi/local_file_system_operation.h +++ b/webkit/browser/fileapi/local_file_system_operation.h @@ -14,9 +14,9 @@ #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/file_writer_delegate.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/scoped_file.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace chromeos { class CrosMountPointProvider; @@ -33,7 +33,7 @@ class FileSystemContext; class RecursiveOperationDelegate; // FileSystemOperation implementation for local file systems. -class WEBKIT_STORAGE_EXPORT LocalFileSystemOperation +class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileSystemOperation : public NON_EXPORTED_BASE(FileSystemOperation), public base::SupportsWeakPtr<LocalFileSystemOperation> { public: diff --git a/webkit/browser/fileapi/local_file_util.h b/webkit/browser/fileapi/local_file_util.h index 80a698a..5d08359 100644 --- a/webkit/browser/fileapi/local_file_util.h +++ b/webkit/browser/fileapi/local_file_util.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/browser/fileapi/file_system_file_util.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -24,7 +24,8 @@ class FileSystemOperationContext; class FileSystemURL; // An instance of this class is created and owned by *MountPointProvider. -class WEBKIT_STORAGE_EXPORT_PRIVATE LocalFileUtil : public FileSystemFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE LocalFileUtil + : public FileSystemFileUtil { public: LocalFileUtil(); virtual ~LocalFileUtil(); diff --git a/webkit/browser/fileapi/mount_points.h b/webkit/browser/fileapi/mount_points.h index b7bc294..5ec67b9 100644 --- a/webkit/browser/fileapi/mount_points.h +++ b/webkit/browser/fileapi/mount_points.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/files/file_path.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/fileapi/file_system_util.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -22,9 +22,9 @@ class FileSystemURL; namespace fileapi { // Represents a set of mount points for File API. -class WEBKIT_STORAGE_EXPORT MountPoints { +class WEBKIT_STORAGE_BROWSER_EXPORT MountPoints { public: - struct WEBKIT_STORAGE_EXPORT MountPointInfo { + struct WEBKIT_STORAGE_BROWSER_EXPORT MountPointInfo { MountPointInfo(); MountPointInfo(const std::string& name, const base::FilePath& path); @@ -103,4 +103,3 @@ class WEBKIT_STORAGE_EXPORT MountPoints { } // namespace fileapi #endif // WEBKIT_BROWSER_FILEAPI_MOUNT_POINTS_H_ - diff --git a/webkit/browser/fileapi/native_file_util.h b/webkit/browser/fileapi/native_file_util.h index 0049526..425e742 100644 --- a/webkit/browser/fileapi/native_file_util.h +++ b/webkit/browser/fileapi/native_file_util.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "webkit/browser/fileapi/file_system_file_util.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class Time; @@ -28,7 +28,7 @@ namespace fileapi { // // Note that all the methods of this class are static and this does NOT // inherit from FileSystemFileUtil. -class WEBKIT_STORAGE_EXPORT_PRIVATE NativeFileUtil { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE NativeFileUtil { public: static base::PlatformFileError CreateOrOpen( const base::FilePath& path, diff --git a/webkit/browser/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h index f7e7a86..3b664fe 100644 --- a/webkit/browser/fileapi/obfuscated_file_util.h +++ b/webkit/browser/fileapi/obfuscated_file_util.h @@ -16,9 +16,9 @@ #include "webkit/browser/fileapi/file_system_file_util.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/sandbox_directory_database.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/shareable_file_reference.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace base { class SequencedTaskRunner; @@ -45,7 +45,7 @@ class TimedTaskHelper; // // This class must be deleted on the FILE thread, because that's where // DropDatabases needs to be called. -class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE ObfuscatedFileUtil : public FileSystemFileUtil { public: // Origin enumerator interface. diff --git a/webkit/browser/fileapi/sandbox_directory_database.h b/webkit/browser/fileapi/sandbox_directory_database.h index a15ec17..5150060 100644 --- a/webkit/browser/fileapi/sandbox_directory_database.h +++ b/webkit/browser/fileapi/sandbox_directory_database.h @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace tracked_objects { class Location; @@ -34,11 +34,11 @@ namespace fileapi { // TODO(ericu): Safe mode, which does more checks such as the above on debug // builds. // TODO(ericu): Add a method that will give a unique filename for a data file. -class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxDirectoryDatabase { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxDirectoryDatabase { public: typedef int64 FileId; - struct WEBKIT_STORAGE_EXPORT_PRIVATE FileInfo { + struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileInfo { FileInfo(); ~FileInfo(); diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.h b/webkit/browser/fileapi/sandbox_file_stream_writer.h index 4ff6ed0..ab1c5f3 100644 --- a/webkit/browser/fileapi/sandbox_file_stream_writer.h +++ b/webkit/browser/fileapi/sandbox_file_stream_writer.h @@ -12,10 +12,10 @@ #include "webkit/browser/fileapi/file_stream_writer.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/task_runner_bound_observer_list.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/blob/shareable_file_reference.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace fileapi { @@ -23,7 +23,7 @@ class FileSystemContext; class FileSystemQuotaUtil; class LocalFileStreamWriter; -class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxFileStreamWriter +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxFileStreamWriter : public FileStreamWriter { public: SandboxFileStreamWriter(FileSystemContext* file_system_context, diff --git a/webkit/browser/fileapi/sandbox_isolated_origin_database.h b/webkit/browser/fileapi/sandbox_isolated_origin_database.h index 72bff72..d262921 100644 --- a/webkit/browser/fileapi/sandbox_isolated_origin_database.h +++ b/webkit/browser/fileapi/sandbox_isolated_origin_database.h @@ -9,7 +9,7 @@ namespace fileapi { -class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxIsolatedOriginDatabase +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxIsolatedOriginDatabase : public SandboxOriginDatabaseInterface { public: static const base::FilePath::CharType kOriginDirectory[]; diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.h b/webkit/browser/fileapi/sandbox_mount_point_provider.h index 20f1f87..f3e195c 100644 --- a/webkit/browser/fileapi/sandbox_mount_point_provider.h +++ b/webkit/browser/fileapi/sandbox_mount_point_provider.h @@ -20,7 +20,7 @@ #include "webkit/browser/fileapi/file_system_quota_util.h" #include "webkit/browser/fileapi/task_runner_bound_observer_list.h" #include "webkit/browser/quota/special_storage_policy.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SequencedTaskRunner; @@ -49,7 +49,7 @@ class SandboxQuotaObserver; // profile directory in a sandboxed way. // This interface also lets one enumerate and remove storage for the origins // that use the filesystem. -class WEBKIT_STORAGE_EXPORT SandboxMountPointProvider +class WEBKIT_STORAGE_BROWSER_EXPORT SandboxMountPointProvider : public FileSystemMountPointProvider, public FileSystemQuotaUtil { public: diff --git a/webkit/browser/fileapi/sandbox_origin_database.h b/webkit/browser/fileapi/sandbox_origin_database.h index fa66613..d7ec66c 100644 --- a/webkit/browser/fileapi/sandbox_origin_database.h +++ b/webkit/browser/fileapi/sandbox_origin_database.h @@ -22,7 +22,7 @@ namespace fileapi { // All methods of this class other than the constructor may be used only from // the browser's FILE thread. The constructor may be used on any thread. -class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxOriginDatabase +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxOriginDatabase : public SandboxOriginDatabaseInterface { public: // Only one instance of SandboxOriginDatabase should exist for a given path diff --git a/webkit/browser/fileapi/sandbox_origin_database_interface.h b/webkit/browser/fileapi/sandbox_origin_database_interface.h index 33b37b6..8b88f93 100644 --- a/webkit/browser/fileapi/sandbox_origin_database_interface.h +++ b/webkit/browser/fileapi/sandbox_origin_database_interface.h @@ -9,13 +9,13 @@ #include <vector> #include "base/files/file_path.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { -class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxOriginDatabaseInterface { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE SandboxOriginDatabaseInterface { public: - struct WEBKIT_STORAGE_EXPORT_PRIVATE OriginRecord { + struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE OriginRecord { std::string origin; base::FilePath path; diff --git a/webkit/browser/fileapi/syncable/file_change.h b/webkit/browser/fileapi/syncable/file_change.h index 9afc623..83143d8 100644 --- a/webkit/browser/fileapi/syncable/file_change.h +++ b/webkit/browser/fileapi/syncable/file_change.h @@ -12,11 +12,11 @@ #include "base/files/file_path.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/syncable/sync_file_type.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace sync_file_system { -class WEBKIT_STORAGE_EXPORT FileChange { +class WEBKIT_STORAGE_BROWSER_EXPORT FileChange { public: enum ChangeType { FILE_CHANGE_ADD_OR_UPDATE, @@ -47,7 +47,7 @@ class WEBKIT_STORAGE_EXPORT FileChange { SyncFileType file_type_; }; -class WEBKIT_STORAGE_EXPORT FileChangeList { +class WEBKIT_STORAGE_BROWSER_EXPORT FileChangeList { public: typedef std::deque<FileChange> List; diff --git a/webkit/browser/fileapi/syncable/local_file_change_tracker.h b/webkit/browser/fileapi/syncable/local_file_change_tracker.h index 6d58cf2..4f25307 100644 --- a/webkit/browser/fileapi/syncable/local_file_change_tracker.h +++ b/webkit/browser/fileapi/syncable/local_file_change_tracker.h @@ -19,7 +19,7 @@ #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/syncable/file_change.h" #include "webkit/browser/fileapi/syncable/sync_status_code.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SequencedTaskRunner; @@ -35,7 +35,7 @@ namespace sync_file_system { // Tracks local file changes for cloud-backed file systems. // All methods must be called on the file_task_runner given to the constructor. // Owned by FileSystemContext. -class WEBKIT_STORAGE_EXPORT LocalFileChangeTracker +class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileChangeTracker : public fileapi::FileUpdateObserver, public fileapi::FileChangeObserver { public: diff --git a/webkit/browser/fileapi/syncable/local_file_sync_context.h b/webkit/browser/fileapi/syncable/local_file_sync_context.h index 2f2b355..3bb616d 100644 --- a/webkit/browser/fileapi/syncable/local_file_sync_context.h +++ b/webkit/browser/fileapi/syncable/local_file_sync_context.h @@ -23,7 +23,7 @@ #include "webkit/browser/fileapi/syncable/local_file_sync_status.h" #include "webkit/browser/fileapi/syncable/sync_callbacks.h" #include "webkit/browser/fileapi/syncable/sync_status_code.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SingleThreadTaskRunner; @@ -47,7 +47,7 @@ class SyncableFileOperationRunner; // object and may exist multiple in a profile). // An instance of this class is shared by FileSystemContexts and outlives // LocalFileSyncService. -class WEBKIT_STORAGE_EXPORT LocalFileSyncContext +class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileSyncContext : public base::RefCountedThreadSafe<LocalFileSyncContext>, public LocalFileSyncStatus::Observer { public: diff --git a/webkit/browser/fileapi/syncable/local_file_sync_status.h b/webkit/browser/fileapi/syncable/local_file_sync_status.h index 99558cc..0cb07eb 100644 --- a/webkit/browser/fileapi/syncable/local_file_sync_status.h +++ b/webkit/browser/fileapi/syncable/local_file_sync_status.h @@ -29,9 +29,10 @@ namespace sync_file_system { // // An entry can have multiple writers but sync is exclusive and cannot overwrap // with any writes or syncs. -class WEBKIT_STORAGE_EXPORT LocalFileSyncStatus : public base::NonThreadSafe { +class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileSyncStatus + : public base::NonThreadSafe { public: - class WEBKIT_STORAGE_EXPORT Observer { + class WEBKIT_STORAGE_BROWSER_EXPORT Observer { public: Observer() {} virtual ~Observer() {} diff --git a/webkit/browser/fileapi/syncable/sync_file_metadata.h b/webkit/browser/fileapi/syncable/sync_file_metadata.h index 9e6dedc..3e53933 100644 --- a/webkit/browser/fileapi/syncable/sync_file_metadata.h +++ b/webkit/browser/fileapi/syncable/sync_file_metadata.h @@ -9,11 +9,11 @@ #include "base/time.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/syncable/file_change.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace sync_file_system { -class WEBKIT_STORAGE_EXPORT SyncFileMetadata { +class WEBKIT_STORAGE_BROWSER_EXPORT SyncFileMetadata { public: SyncFileMetadata(); SyncFileMetadata(SyncFileType file_type, @@ -28,7 +28,7 @@ class WEBKIT_STORAGE_EXPORT SyncFileMetadata { bool operator==(const SyncFileMetadata& that) const; }; -struct WEBKIT_STORAGE_EXPORT LocalFileSyncInfo { +struct WEBKIT_STORAGE_BROWSER_EXPORT LocalFileSyncInfo { LocalFileSyncInfo(); ~LocalFileSyncInfo(); diff --git a/webkit/browser/fileapi/syncable/sync_status_code.h b/webkit/browser/fileapi/syncable/sync_status_code.h index a93027f..1dbf637 100644 --- a/webkit/browser/fileapi/syncable/sync_status_code.h +++ b/webkit/browser/fileapi/syncable/sync_status_code.h @@ -8,7 +8,7 @@ #include <string> #include "base/platform_file.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace leveldb { class Status; @@ -61,12 +61,13 @@ enum SyncStatusCode { SYNC_STATUS_SYNC_DISABLED = -110, }; -WEBKIT_STORAGE_EXPORT std::string SyncStatusCodeToString(SyncStatusCode status); +WEBKIT_STORAGE_BROWSER_EXPORT std::string SyncStatusCodeToString( + SyncStatusCode status); -WEBKIT_STORAGE_EXPORT SyncStatusCode LevelDBStatusToSyncStatusCode( +WEBKIT_STORAGE_BROWSER_EXPORT SyncStatusCode LevelDBStatusToSyncStatusCode( const leveldb::Status& status); -WEBKIT_STORAGE_EXPORT SyncStatusCode PlatformFileErrorToSyncStatusCode( +WEBKIT_STORAGE_BROWSER_EXPORT SyncStatusCode PlatformFileErrorToSyncStatusCode( base::PlatformFileError file_error); } // namespace sync_file_system diff --git a/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h index 2b2f9d0..4b35b81 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h +++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h @@ -15,7 +15,7 @@ #include "base/threading/non_thread_safe.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/syncable/local_file_sync_status.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileSystemURL; @@ -25,7 +25,7 @@ namespace sync_file_system { // This class must run only on IO thread. // Owned by LocalFileSyncContext. -class WEBKIT_STORAGE_EXPORT SyncableFileOperationRunner +class WEBKIT_STORAGE_BROWSER_EXPORT SyncableFileOperationRunner : public base::NonThreadSafe, public base::SupportsWeakPtr<SyncableFileOperationRunner>, public LocalFileSyncStatus::Observer { diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_operation.h b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h index 90b68b2d..234b71e 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_system_operation.h +++ b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "webkit/browser/fileapi/local_file_system_operation.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileSystemContext; @@ -26,7 +26,7 @@ namespace sync_file_system { class SyncableFileOperationRunner; // A wrapper class of LocalFileSystemOperation for syncable file system. -class WEBKIT_STORAGE_EXPORT SyncableFileSystemOperation +class WEBKIT_STORAGE_BROWSER_EXPORT SyncableFileSystemOperation : public fileapi::LocalFileSystemOperation, public base::SupportsWeakPtr<SyncableFileSystemOperation>, public base::NonThreadSafe { diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_util.h b/webkit/browser/fileapi/syncable/syncable_file_system_util.h index c07e0cb..5935df9 100644 --- a/webkit/browser/fileapi/syncable/syncable_file_system_util.h +++ b/webkit/browser/fileapi/syncable/syncable_file_system_util.h @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "webkit/browser/fileapi/file_system_url.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileSystemContext; @@ -20,13 +20,14 @@ class LocalFileSystemOperation; namespace sync_file_system { // Registers a syncable filesystem. -WEBKIT_STORAGE_EXPORT void RegisterSyncableFileSystem(); +WEBKIT_STORAGE_BROWSER_EXPORT void RegisterSyncableFileSystem(); // Revokes the syncable filesystem. -WEBKIT_STORAGE_EXPORT void RevokeSyncableFileSystem(); +WEBKIT_STORAGE_BROWSER_EXPORT void RevokeSyncableFileSystem(); // Returns the root URI of the syncable filesystem for |origin|. -WEBKIT_STORAGE_EXPORT GURL GetSyncableFileSystemRootURI(const GURL& origin); +WEBKIT_STORAGE_BROWSER_EXPORT GURL GetSyncableFileSystemRootURI( + const GURL& origin); // Creates a FileSystem URL for the |path| in a syncable filesystem for // |origin|. @@ -35,11 +36,12 @@ WEBKIT_STORAGE_EXPORT GURL GetSyncableFileSystemRootURI(const GURL& origin); // origin: 'http://www.example.com/', // path: '/foo/bar', // returns 'filesystem:http://www.example.com/external/syncfs/foo/bar' -WEBKIT_STORAGE_EXPORT fileapi::FileSystemURL CreateSyncableFileSystemURL( - const GURL& origin, const base::FilePath& path); +WEBKIT_STORAGE_BROWSER_EXPORT fileapi::FileSystemURL +CreateSyncableFileSystemURL(const GURL& origin, const base::FilePath& path); // Creates a special filesystem URL for synchronizing |syncable_url|. -WEBKIT_STORAGE_EXPORT fileapi::FileSystemURL CreateSyncableFileSystemURLForSync( +WEBKIT_STORAGE_BROWSER_EXPORT fileapi::FileSystemURL +CreateSyncableFileSystemURLForSync( fileapi::FileSystemContext* file_system_context, const fileapi::FileSystemURL& syncable_url); @@ -58,7 +60,7 @@ WEBKIT_STORAGE_EXPORT fileapi::FileSystemURL CreateSyncableFileSystemURLForSync( // 'filesystem:http://www.example.com/external/syncfs/foo\\bar' // (on others) // 'filesystem:http://www.example.com/external/syncfs/foo/bar' -WEBKIT_STORAGE_EXPORT bool SerializeSyncableFileSystemURL( +WEBKIT_STORAGE_BROWSER_EXPORT bool SerializeSyncableFileSystemURL( const fileapi::FileSystemURL& url, std::string* serialized_url); // Deserializes a serialized FileSystem URL string |serialized_url| and sets the @@ -71,13 +73,13 @@ WEBKIT_STORAGE_EXPORT bool SerializeSyncableFileSystemURL( // behavior). // // See the comment of SerializeSyncableFileSystemURL() for more details. -WEBKIT_STORAGE_EXPORT bool DeserializeSyncableFileSystemURL( +WEBKIT_STORAGE_BROWSER_EXPORT bool DeserializeSyncableFileSystemURL( const std::string& serialized_url, fileapi::FileSystemURL* url); // Enables or disables directory operations in Sync FileSystem API. // TODO(nhiroki): This method should be used only for testing and should go // away when we fully support directory operations. (http://crbug.com/161442) -WEBKIT_STORAGE_EXPORT void SetEnableSyncFSDirectoryOperation(bool flag); +WEBKIT_STORAGE_BROWSER_EXPORT void SetEnableSyncFSDirectoryOperation(bool flag); // Returns true if we allow directory operations in Sync FileSystem API. // It is disabled by default but can be overridden by a command-line switch @@ -85,7 +87,7 @@ WEBKIT_STORAGE_EXPORT void SetEnableSyncFSDirectoryOperation(bool flag); // SetEnableSyncFSDirectoryOperation(). // TODO(nhiroki): This method should be used only for testing and should go // away when we fully support directory operations. (http://crbug.com/161442) -WEBKIT_STORAGE_EXPORT bool IsSyncFSDirectoryOperationEnabled(); +WEBKIT_STORAGE_BROWSER_EXPORT bool IsSyncFSDirectoryOperationEnabled(); } // namespace sync_file_system diff --git a/webkit/browser/fileapi/test_mount_point_provider.h b/webkit/browser/fileapi/test_mount_point_provider.h index 5f24a08..db7bac3 100644 --- a/webkit/browser/fileapi/test_mount_point_provider.h +++ b/webkit/browser/fileapi/test_mount_point_provider.h @@ -11,7 +11,7 @@ #include "webkit/browser/fileapi/async_file_util_adapter.h" #include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/browser/fileapi/task_runner_bound_observer_list.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SequencedTaskRunner; @@ -25,7 +25,7 @@ class FileSystemQuotaUtil; // This should be only used for testing. // This mount point provider uses LocalFileUtil and stores data file // under the given directory. -class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE TestMountPointProvider : public FileSystemMountPointProvider { public: TestMountPointProvider( diff --git a/webkit/browser/fileapi/timed_task_helper.h b/webkit/browser/fileapi/timed_task_helper.h index ad72fb8..9e78c7c 100644 --- a/webkit/browser/fileapi/timed_task_helper.h +++ b/webkit/browser/fileapi/timed_task_helper.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SequencedTaskRunner; @@ -23,7 +23,7 @@ namespace fileapi { // runs tasks on it (instead of implicitly bound to a thread). // TODO(kinuko): This has nothing to do with fileapi. Move somewhere // more common place. -class WEBKIT_STORAGE_EXPORT TimedTaskHelper { +class WEBKIT_STORAGE_BROWSER_EXPORT TimedTaskHelper { public: explicit TimedTaskHelper(base::SequencedTaskRunner* task_runner); ~TimedTaskHelper(); diff --git a/webkit/browser/fileapi/transient_file_util.h b/webkit/browser/fileapi/transient_file_util.h index a10a911..d3d56c1 100644 --- a/webkit/browser/fileapi/transient_file_util.h +++ b/webkit/browser/fileapi/transient_file_util.h @@ -7,13 +7,13 @@ #include "base/memory/scoped_ptr.h" #include "webkit/browser/fileapi/isolated_file_util.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace fileapi { class FileSystemOperationContext; -class WEBKIT_STORAGE_EXPORT_PRIVATE TransientFileUtil +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE TransientFileUtil : public IsolatedFileUtil { public: TransientFileUtil() {} diff --git a/webkit/browser/fileapi/upload_file_system_file_element_reader.h b/webkit/browser/fileapi/upload_file_system_file_element_reader.h index 525dc00..e1a13a5e 100644 --- a/webkit/browser/fileapi/upload_file_system_file_element_reader.h +++ b/webkit/browser/fileapi/upload_file_system_file_element_reader.h @@ -9,7 +9,7 @@ #include "base/time.h" #include "googleurl/src/gurl.h" #include "net/base/upload_element_reader.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace webkit_blob { class FileStreamReader; @@ -20,7 +20,7 @@ namespace fileapi { class FileSystemContext; // An UploadElementReader implementation for filesystem file. -class WEBKIT_STORAGE_EXPORT UploadFileSystemFileElementReader +class WEBKIT_STORAGE_BROWSER_EXPORT UploadFileSystemFileElementReader : public net::UploadElementReader { public: UploadFileSystemFileElementReader( diff --git a/webkit/browser/quota/quota_client.h b/webkit/browser/quota/quota_client.h index 69b95db..20e03e0 100644 --- a/webkit/browser/quota/quota_client.h +++ b/webkit/browser/quota/quota_client.h @@ -11,8 +11,8 @@ #include "base/callback.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace quota { @@ -20,7 +20,7 @@ namespace quota { // Each storage API must provide an implementation of this interface and // register it to the quota manager. // All the methods are assumed to be called on the IO thread in the browser. -class WEBKIT_STORAGE_EXPORT QuotaClient { +class WEBKIT_STORAGE_BROWSER_EXPORT QuotaClient { public: typedef base::Callback<void(int64 usage)> GetUsageCallback; typedef base::Callback<void(const std::set<GURL>& origins)> diff --git a/webkit/browser/quota/quota_database.h b/webkit/browser/quota/quota_database.h index ad9d5ad..d81cc1a 100644 --- a/webkit/browser/quota/quota_database.h +++ b/webkit/browser/quota/quota_database.h @@ -16,8 +16,8 @@ #include "base/time.h" #include "base/timer.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" namespace sql { class Connection; @@ -31,7 +31,7 @@ namespace quota { class SpecialStoragePolicy; // All the methods of this class must run on the DB thread. -class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaDatabase { +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE QuotaDatabase { public: // Constants for {Get,Set}QuotaConfigValue keys. static const char kDesiredAvailableSpaceKey[]; @@ -88,7 +88,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaDatabase { bool SetOriginDatabaseBootstrapped(bool bootstrap_flag); private: - struct WEBKIT_STORAGE_EXPORT_PRIVATE QuotaTableEntry { + struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE QuotaTableEntry { QuotaTableEntry(); QuotaTableEntry( const std::string& host, @@ -98,10 +98,10 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaDatabase { StorageType type; int64 quota; }; - friend WEBKIT_STORAGE_EXPORT_PRIVATE bool operator <( + friend WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE bool operator <( const QuotaTableEntry& lhs, const QuotaTableEntry& rhs); - struct WEBKIT_STORAGE_EXPORT_PRIVATE OriginInfoTableEntry { + struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE OriginInfoTableEntry { OriginInfoTableEntry(); OriginInfoTableEntry( const GURL& origin, @@ -115,7 +115,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaDatabase { base::Time last_access_time; base::Time last_modified_time; }; - friend WEBKIT_STORAGE_EXPORT_PRIVATE bool operator <( + friend WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE bool operator <( const OriginInfoTableEntry& lhs, const OriginInfoTableEntry& rhs); // Structures used for CreateSchema. diff --git a/webkit/browser/quota/quota_manager.h b/webkit/browser/quota/quota_manager.h index 9496b97..e607ff2 100644 --- a/webkit/browser/quota/quota_manager.h +++ b/webkit/browser/quota/quota_manager.h @@ -25,7 +25,7 @@ #include "webkit/browser/quota/quota_database.h" #include "webkit/browser/quota/quota_task.h" #include "webkit/browser/quota/special_storage_policy.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class FilePath; @@ -47,7 +47,7 @@ class UsageTracker; struct QuotaManagerDeleter; -struct WEBKIT_STORAGE_EXPORT UsageAndQuota { +struct WEBKIT_STORAGE_BROWSER_EXPORT UsageAndQuota { int64 usage; int64 global_limited_usage; int64 quota; @@ -61,7 +61,7 @@ struct WEBKIT_STORAGE_EXPORT UsageAndQuota { }; // An interface called by QuotaTemporaryStorageEvictor. -class WEBKIT_STORAGE_EXPORT QuotaEvictionHandler { +class WEBKIT_STORAGE_BROWSER_EXPORT QuotaEvictionHandler { public: typedef base::Callback<void(const GURL&)> GetLRUOriginCallback; typedef StatusCallback EvictOriginDataCallback; @@ -100,7 +100,7 @@ struct UsageInfo { // The quota manager class. This class is instantiated per profile and // held by the profile. With the exception of the constructor and the // proxy() method, all methods should only be called on the IO thread. -class WEBKIT_STORAGE_EXPORT QuotaManager +class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManager : public QuotaTaskObserver, public QuotaEvictionHandler, public base::RefCountedThreadSafe<QuotaManager, QuotaManagerDeleter> { @@ -429,7 +429,7 @@ struct QuotaManagerDeleter { }; // The proxy may be called and finally released on any thread. -class WEBKIT_STORAGE_EXPORT QuotaManagerProxy +class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManagerProxy : public base::RefCountedThreadSafe<QuotaManagerProxy> { public: virtual void RegisterClient(QuotaClient* client); diff --git a/webkit/browser/quota/quota_task.h b/webkit/browser/quota/quota_task.h index ba2ef5f..65344e9 100644 --- a/webkit/browser/quota/quota_task.h +++ b/webkit/browser/quota/quota_task.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" namespace base { class SingleThreadTaskRunner; @@ -61,7 +61,7 @@ class QuotaTask { bool delete_scheduled_; }; -class WEBKIT_STORAGE_EXPORT QuotaTaskObserver { +class WEBKIT_STORAGE_BROWSER_EXPORT QuotaTaskObserver { protected: friend class QuotaTask; diff --git a/webkit/browser/quota/quota_temporary_storage_evictor.h b/webkit/browser/quota/quota_temporary_storage_evictor.h index a4833b4..2b282de 100644 --- a/webkit/browser/quota/quota_temporary_storage_evictor.h +++ b/webkit/browser/quota/quota_temporary_storage_evictor.h @@ -11,8 +11,8 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/timer.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/storage/webkit_storage_export.h" class GURL; @@ -21,7 +21,7 @@ namespace quota { class QuotaEvictionHandler; struct UsageAndQuota; -class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaTemporaryStorageEvictor +class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE QuotaTemporaryStorageEvictor : public base::NonThreadSafe { public: struct Statistics { diff --git a/webkit/browser/quota/special_storage_policy.h b/webkit/browser/quota/special_storage_policy.h index beafea3..c8beb44 100644 --- a/webkit/browser/quota/special_storage_policy.h +++ b/webkit/browser/quota/special_storage_policy.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/browser/webkit_storage_browser_export.h" class GURL; @@ -21,7 +21,7 @@ namespace quota { // is currently installed in the extensions system. // The IsSomething() methods must be thread-safe, however Observers should // only be notified, added, and removed on the IO thead. -class WEBKIT_STORAGE_EXPORT SpecialStoragePolicy +class WEBKIT_STORAGE_BROWSER_EXPORT SpecialStoragePolicy : public base::RefCountedThreadSafe<SpecialStoragePolicy> { public: typedef int StoragePolicy; @@ -30,7 +30,7 @@ class WEBKIT_STORAGE_EXPORT SpecialStoragePolicy STORAGE_UNLIMITED = 1 << 1, }; - class WEBKIT_STORAGE_EXPORT Observer { + class WEBKIT_STORAGE_BROWSER_EXPORT Observer { public: virtual void OnGranted(const GURL& origin, int change_flags) = 0; virtual void OnRevoked(const GURL& origin, int change_flags) = 0; diff --git a/webkit/browser/quota/usage_tracker.h b/webkit/browser/quota/usage_tracker.h index 8d6b2b6..facef74 100644 --- a/webkit/browser/quota/usage_tracker.h +++ b/webkit/browser/quota/usage_tracker.h @@ -19,6 +19,7 @@ #include "webkit/browser/quota/quota_client.h" #include "webkit/browser/quota/quota_task.h" #include "webkit/browser/quota/special_storage_policy.h" +#include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/quota/quota_types.h" namespace quota { @@ -28,7 +29,7 @@ class ClientUsageTracker; // A helper class that gathers and tracks the amount of data stored in // all quota clients. // An instance of this class is created per storage type. -class WEBKIT_STORAGE_EXPORT UsageTracker : public QuotaTaskObserver { +class WEBKIT_STORAGE_BROWSER_EXPORT UsageTracker : public QuotaTaskObserver { public: UsageTracker(const QuotaClientList& clients, StorageType type, SpecialStoragePolicy* special_storage_policy); diff --git a/webkit/browser/webkit_storage_browser_export.h b/webkit/browser/webkit_storage_browser_export.h new file mode 100644 index 0000000..bfe2599 --- /dev/null +++ b/webkit/browser/webkit_storage_browser_export.h @@ -0,0 +1,34 @@ +// Copyright (c) 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. + +#ifndef WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_ +#define WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION) +#define WEBKIT_STORAGE_BROWSER_EXPORT __declspec(dllexport) +#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __declspec(dllexport) +#else +#define WEBKIT_STORAGE_BROWSER_EXPORT __declspec(dllimport) +#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __declspec(dllimport) +#endif // defined(BROWSER_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION) +#define WEBKIT_STORAGE_BROWSER_EXPORT __attribute__((visibility("default"))) +#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __attribute__((visibility("default"))) +#else +#define WEBKIT_STORAGE_BROWSER_EXPORT +#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define WEBKIT_STORAGE_BROWSER_EXPORT +#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE +#endif + +#endif // WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_ diff --git a/webkit/common/appcache/appcache_interfaces.h b/webkit/common/appcache/appcache_interfaces.h index 8ab53f0..34bc411 100644 --- a/webkit/common/appcache/appcache_interfaces.h +++ b/webkit/common/appcache/appcache_interfaces.h @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace net { class URLRequest; @@ -61,7 +61,7 @@ enum NamespaceType { NETWORK_NAMESPACE }; -struct WEBKIT_COMMON_EXPORT AppCacheInfo { +struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheInfo { AppCacheInfo(); ~AppCacheInfo(); @@ -79,7 +79,7 @@ struct WEBKIT_COMMON_EXPORT AppCacheInfo { typedef std::vector<AppCacheInfo> AppCacheInfoVector; // Type to hold information about a single appcache resource. -struct WEBKIT_COMMON_EXPORT AppCacheResourceInfo { +struct WEBKIT_STORAGE_COMMON_EXPORT AppCacheResourceInfo { AppCacheResourceInfo(); ~AppCacheResourceInfo(); @@ -96,7 +96,7 @@ struct WEBKIT_COMMON_EXPORT AppCacheResourceInfo { typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector; -struct WEBKIT_COMMON_EXPORT Namespace { +struct WEBKIT_STORAGE_COMMON_EXPORT Namespace { Namespace(); // Type is set to FALLBACK_NAMESPACE by default. Namespace(NamespaceType type, const GURL& url, const GURL& target, bool is_pattern); @@ -116,7 +116,7 @@ struct WEBKIT_COMMON_EXPORT Namespace { typedef std::vector<Namespace> NamespaceVector; // Interface used by backend (browser-process) to talk to frontend (renderer). -class WEBKIT_COMMON_EXPORT AppCacheFrontend { +class WEBKIT_STORAGE_COMMON_EXPORT AppCacheFrontend { public: virtual void OnCacheSelected( int host_id, const appcache::AppCacheInfo& info) = 0; @@ -137,7 +137,7 @@ class WEBKIT_COMMON_EXPORT AppCacheFrontend { }; // Interface used by frontend (renderer) to talk to backend (browser-process). -class WEBKIT_COMMON_EXPORT AppCacheBackend { +class WEBKIT_STORAGE_COMMON_EXPORT AppCacheBackend { public: virtual void RegisterHost(int host_id) = 0; virtual void UnregisterHost(int host_id) = 0; @@ -169,22 +169,22 @@ class WEBKIT_COMMON_EXPORT AppCacheBackend { // Note: These are also defined elsewhere in the chrome code base in // url_contants.h .cc, however the appcache library doesn't not have // any dependencies on the chrome library, so we can't use them in here. -WEBKIT_COMMON_EXPORT extern const char kHttpScheme[]; -WEBKIT_COMMON_EXPORT extern const char kHttpsScheme[]; -WEBKIT_COMMON_EXPORT extern const char kHttpGETMethod[]; -WEBKIT_COMMON_EXPORT extern const char kHttpHEADMethod[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpScheme[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpsScheme[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpGETMethod[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpHEADMethod[]; // CommandLine flag to turn this experimental feature on. -WEBKIT_COMMON_EXPORT extern const char kEnableExecutableHandlers[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kEnableExecutableHandlers[]; -WEBKIT_COMMON_EXPORT void AddSupportedScheme(const char* scheme); +WEBKIT_STORAGE_COMMON_EXPORT void AddSupportedScheme(const char* scheme); -WEBKIT_COMMON_EXPORT bool IsSchemeSupported(const GURL& url); -WEBKIT_COMMON_EXPORT bool IsMethodSupported(const std::string& method); -WEBKIT_COMMON_EXPORT bool IsSchemeAndMethodSupported( +WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeSupported(const GURL& url); +WEBKIT_STORAGE_COMMON_EXPORT bool IsMethodSupported(const std::string& method); +WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeAndMethodSupported( const net::URLRequest* request); -WEBKIT_COMMON_EXPORT extern const base::FilePath::CharType +WEBKIT_STORAGE_COMMON_EXPORT extern const base::FilePath::CharType kAppCacheDatabaseName[]; } // namespace diff --git a/webkit/common/blob/blob_data.h b/webkit/common/blob/blob_data.h index c8fd260..0f4c09d 100644 --- a/webkit/common/blob/blob_data.h +++ b/webkit/common/blob/blob_data.h @@ -15,11 +15,12 @@ #include "googleurl/src/gurl.h" #include "webkit/base/data_element.h" #include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace webkit_blob { -class WEBKIT_COMMON_EXPORT BlobData : public base::RefCounted<BlobData> { +class WEBKIT_STORAGE_COMMON_EXPORT BlobData + : public base::RefCounted<BlobData> { public: typedef webkit_base::DataElement Item; diff --git a/webkit/common/blob/scoped_file.h b/webkit/common/blob/scoped_file.h index 7bbbc0d..b9d0bba 100644 --- a/webkit/common/blob/scoped_file.h +++ b/webkit/common/blob/scoped_file.h @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/move.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace base { class TaskRunner; @@ -26,7 +26,7 @@ namespace webkit_blob { // // TODO(kinuko): Probably this can be moved under base or somewhere more // common place. -class WEBKIT_COMMON_EXPORT ScopedFile { +class WEBKIT_STORAGE_COMMON_EXPORT ScopedFile { // To support destructive assignment from an l-value assignment. // This provides Pass() method which creates an r-value for the current // instance. (See base/move.h for details) diff --git a/webkit/common/blob/shareable_file_reference.h b/webkit/common/blob/shareable_file_reference.h index 987374b..daaa20c 100644 --- a/webkit/common/blob/shareable_file_reference.h +++ b/webkit/common/blob/shareable_file_reference.h @@ -15,7 +15,7 @@ namespace webkit_blob { // same path if it already exists in its internal map. // This class is non-thread-safe and all methods must be called on a single // thread. -class WEBKIT_COMMON_EXPORT ShareableFileReference +class WEBKIT_STORAGE_COMMON_EXPORT ShareableFileReference : public base::RefCounted<ShareableFileReference> { public: typedef ScopedFile::ScopeOutCallback FinalReleaseCallback; diff --git a/webkit/common/database/database_connections.h b/webkit/common/database/database_connections.h index 0b46ae6..39c8151 100644 --- a/webkit/common/database/database_connections.h +++ b/webkit/common/database/database_connections.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "base/synchronization/lock.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace base { class MessageLoopProxy; @@ -19,7 +19,7 @@ class MessageLoopProxy; namespace webkit_database { -class WEBKIT_COMMON_EXPORT DatabaseConnections { +class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections { public: DatabaseConnections(); ~DatabaseConnections(); @@ -68,7 +68,7 @@ class WEBKIT_COMMON_EXPORT DatabaseConnections { // A wrapper class that provides thread-safety and the // ability to wait until all connections have closed. // Intended for use in renderer processes. -class WEBKIT_COMMON_EXPORT DatabaseConnectionsWrapper +class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnectionsWrapper : public base::RefCountedThreadSafe<DatabaseConnectionsWrapper> { public: DatabaseConnectionsWrapper(); diff --git a/webkit/common/dom_storage/dom_storage_map.h b/webkit/common/dom_storage/dom_storage_map.h index e827899..8920e7f 100644 --- a/webkit/common/dom_storage/dom_storage_map.h +++ b/webkit/common/dom_storage/dom_storage_map.h @@ -11,14 +11,14 @@ #include "base/nullable_string16.h" #include "base/strings/string16.h" #include "webkit/common/dom_storage/dom_storage_types.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace dom_storage { // A wrapper around a std::map that adds refcounting and // tracks the size in bytes of the keys/values, enforcing a quota. // See class comments for DomStorageContext for a larger overview. -class WEBKIT_COMMON_EXPORT DomStorageMap +class WEBKIT_STORAGE_COMMON_EXPORT DomStorageMap : public base::RefCountedThreadSafe<DomStorageMap> { public: explicit DomStorageMap(size_t quota); diff --git a/webkit/common/dom_storage/dom_storage_types.h b/webkit/common/dom_storage/dom_storage_types.h index af3d6c4..6a198dd 100644 --- a/webkit/common/dom_storage/dom_storage_types.h +++ b/webkit/common/dom_storage/dom_storage_types.h @@ -12,7 +12,7 @@ #include "base/strings/string16.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace dom_storage { @@ -40,7 +40,7 @@ const int kInvalidAreaId = -1; typedef std::map<base::string16, NullableString16> ValuesMap; -struct WEBKIT_COMMON_EXPORT LocalStorageUsageInfo { +struct WEBKIT_STORAGE_COMMON_EXPORT LocalStorageUsageInfo { GURL origin; size_t data_size; base::Time last_modified; @@ -49,7 +49,7 @@ struct WEBKIT_COMMON_EXPORT LocalStorageUsageInfo { ~LocalStorageUsageInfo(); }; -struct WEBKIT_COMMON_EXPORT SessionStorageUsageInfo { +struct WEBKIT_STORAGE_COMMON_EXPORT SessionStorageUsageInfo { GURL origin; std::string persistent_namespace_id; diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h index 2e4f646..adf9be4 100644 --- a/webkit/common/fileapi/file_system_util.h +++ b/webkit/common/fileapi/file_system_util.h @@ -10,23 +10,23 @@ #include "base/files/file_path.h" #include "base/platform_file.h" -#include "third_party/WebKit/public/platform/WebFileSystemType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/common/quota/quota_types.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" class GURL; namespace fileapi { -WEBKIT_COMMON_EXPORT extern const char kPersistentDir[]; -WEBKIT_COMMON_EXPORT extern const char kTemporaryDir[]; -WEBKIT_COMMON_EXPORT extern const char kExternalDir[]; -WEBKIT_COMMON_EXPORT extern const char kIsolatedDir[]; -WEBKIT_COMMON_EXPORT extern const char kTestDir[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kPersistentDir[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kTemporaryDir[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kExternalDir[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kIsolatedDir[]; +WEBKIT_STORAGE_COMMON_EXPORT extern const char kTestDir[]; -class WEBKIT_COMMON_EXPORT VirtualPath { +class WEBKIT_STORAGE_COMMON_EXPORT VirtualPath { public: static const base::FilePath::CharType kRoot[]; static const base::FilePath::CharType kSeparator; @@ -70,7 +70,7 @@ class WEBKIT_COMMON_EXPORT VirtualPath { // returns URL without the filesystem ID. // // |type| needs to be public type as the returned URI is given to the renderer. -WEBKIT_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url, +WEBKIT_STORAGE_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url, FileSystemType type); // Returns the name for the filesystem that is specified by a pair of @@ -84,25 +84,27 @@ WEBKIT_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url, // Example: // The name for a TEMPORARY filesystem of "http://www.example.com:80/" // should look like: "http_www.example.host_80:temporary" -WEBKIT_COMMON_EXPORT std::string GetFileSystemName(const GURL& origin_url, - FileSystemType type); +WEBKIT_STORAGE_COMMON_EXPORT std::string +GetFileSystemName(const GURL& origin_url, FileSystemType type); // Converts FileSystemType |type| to/from the StorageType |storage_type| that // is used for the unified quota system. // (Basically this naively maps TEMPORARY storage type to TEMPORARY filesystem // type, PERSISTENT storage type to PERSISTENT filesystem type and vice versa.) -WEBKIT_COMMON_EXPORT FileSystemType QuotaStorageTypeToFileSystemType( - quota::StorageType storage_type); -WEBKIT_COMMON_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType( - FileSystemType type); +WEBKIT_STORAGE_COMMON_EXPORT FileSystemType +QuotaStorageTypeToFileSystemType(quota::StorageType storage_type); + +WEBKIT_STORAGE_COMMON_EXPORT quota::StorageType +FileSystemTypeToQuotaStorageType(FileSystemType type); // Returns the string representation of the given filesystem |type|. // Returns an empty string if the |type| is invalid. -WEBKIT_COMMON_EXPORT std::string GetFileSystemTypeString(FileSystemType type); +WEBKIT_STORAGE_COMMON_EXPORT std::string +GetFileSystemTypeString(FileSystemType type); // Sets type to FileSystemType enum that corresponds to the string name. // Returns false if the |type_string| is invalid. -WEBKIT_COMMON_EXPORT bool GetFileSystemPublicType( +WEBKIT_STORAGE_COMMON_EXPORT bool GetFileSystemPublicType( std::string type_string, WebKit::WebFileSystemType* type); @@ -114,20 +116,20 @@ WEBKIT_COMMON_EXPORT bool GetFileSystemPublicType( // // TODO(tzik): Replace CreateFilePath and FilePathToString in // third_party/leveldatabase/env_chromium.cc with them. -WEBKIT_COMMON_EXPORT std::string FilePathToString( +WEBKIT_STORAGE_COMMON_EXPORT std::string FilePathToString( const base::FilePath& file_path); // Decode a file path from |file_path_string|. -WEBKIT_COMMON_EXPORT base::FilePath StringToFilePath( +WEBKIT_STORAGE_COMMON_EXPORT base::FilePath StringToFilePath( const std::string& file_path_string); // File error conversion -WEBKIT_COMMON_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError( - base::PlatformFileError error_code); +WEBKIT_STORAGE_COMMON_EXPORT WebKit::WebFileError +PlatformFileErrorToWebFileError(base::PlatformFileError error_code); // Generate a file system name for the given arguments. Should only be used by // platform apps. -WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemName( +WEBKIT_STORAGE_COMMON_EXPORT std::string GetIsolatedFileSystemName( const GURL& origin_url, const std::string& filesystem_id); @@ -135,21 +137,21 @@ WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemName( // platform apps. This function will return false if the file system name is // not of the form {origin}:Isolated_{id}, and will also check that there is an // origin and id present. It will not check that the origin or id are valid. -WEBKIT_COMMON_EXPORT bool CrackIsolatedFileSystemName( +WEBKIT_STORAGE_COMMON_EXPORT bool CrackIsolatedFileSystemName( const std::string& filesystem_name, std::string* filesystem_id); // Returns the root URI for an isolated filesystem for origin |origin_url| // and |filesystem_id|. If the |optional_root_name| is given the resulting // root URI will point to the subfolder within the isolated filesystem. -WEBKIT_COMMON_EXPORT std::string GetIsolatedFileSystemRootURIString( +WEBKIT_STORAGE_COMMON_EXPORT std::string GetIsolatedFileSystemRootURIString( const GURL& origin_url, const std::string& filesystem_id, const std::string& optional_root_name); // Returns the root URI for an external filesystem for origin |origin_url| // and |mount_name|. -WEBKIT_COMMON_EXPORT std::string GetExternalFileSystemRootURIString( +WEBKIT_STORAGE_COMMON_EXPORT std::string GetExternalFileSystemRootURIString( const GURL& origin_url, const std::string& mount_name); diff --git a/webkit/common/quota/quota_status_code.h b/webkit/common/quota/quota_status_code.h index 6cffa91..aedef63 100644 --- a/webkit/common/quota/quota_status_code.h +++ b/webkit/common/quota/quota_status_code.h @@ -6,7 +6,7 @@ #define WEBKIT_COMMON_QUOTA_QUOTA_STATUS_CODE_H_ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaError.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/common/webkit_storage_common_export.h" namespace quota { @@ -20,7 +20,7 @@ enum QuotaStatusCode { kQuotaStatusUnknown = -1, }; -WEBKIT_COMMON_EXPORT const char* QuotaStatusCodeToString( +WEBKIT_STORAGE_COMMON_EXPORT const char* QuotaStatusCodeToString( QuotaStatusCode status); } // namespace quota diff --git a/webkit/common/webkit_storage_common_export.h b/webkit/common/webkit_storage_common_export.h new file mode 100644 index 0000000..302ddee --- /dev/null +++ b/webkit/common/webkit_storage_common_export.h @@ -0,0 +1,29 @@ +// Copyright (c) 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. + +#ifndef WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_ +#define WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION) +#define WEBKIT_STORAGE_COMMON_EXPORT __declspec(dllexport) +#else +#define WEBKIT_STORAGE_COMMON_EXPORT __declspec(dllimport) +#endif // defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION) +#define WEBKIT_STORAGE_COMMON_EXPORT __attribute__((visibility("default"))) +#else +#define WEBKIT_STORAGE_COMMON_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define WEBKIT_STORAGE_COMMON_EXPORT +#endif + +#endif // WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_ diff --git a/webkit/renderer/appcache/appcache_frontend_impl.h b/webkit/renderer/appcache/appcache_frontend_impl.h index ccca377..42ba745 100644 --- a/webkit/renderer/appcache/appcache_frontend_impl.h +++ b/webkit/renderer/appcache/appcache_frontend_impl.h @@ -9,11 +9,12 @@ #include <vector> #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/renderer/webkit_storage_renderer_export.h" namespace appcache { -class WEBKIT_STORAGE_EXPORT AppCacheFrontendImpl : public AppCacheFrontend { +class WEBKIT_STORAGE_RENDERER_EXPORT AppCacheFrontendImpl + : public AppCacheFrontend { public: virtual void OnCacheSelected( int host_id, const appcache::AppCacheInfo& info) OVERRIDE; diff --git a/webkit/renderer/appcache/web_application_cache_host_impl.h b/webkit/renderer/appcache/web_application_cache_host_impl.h index 8abe748..eb471af 100644 --- a/webkit/renderer/appcache/web_application_cache_host_impl.h +++ b/webkit/renderer/appcache/web_application_cache_host_impl.h @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/renderer/webkit_storage_renderer_export.h" namespace WebKit { class WebFrame; @@ -20,7 +20,7 @@ class WebFrame; namespace appcache { -class WEBKIT_STORAGE_EXPORT WebApplicationCacheHostImpl +class WEBKIT_STORAGE_RENDERER_EXPORT WebApplicationCacheHostImpl : NON_EXPORTED_BASE(public WebKit::WebApplicationCacheHost) { public: // Returns the host having given id or NULL if there is no such host. diff --git a/webkit/renderer/dom_storage/dom_storage_cached_area.h b/webkit/renderer/dom_storage/dom_storage_cached_area.h index 4cac9c4..d8620ee 100644 --- a/webkit/renderer/dom_storage/dom_storage_cached_area.h +++ b/webkit/renderer/dom_storage/dom_storage_cached_area.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/nullable_string16.h" #include "googleurl/src/gurl.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/renderer/webkit_storage_renderer_export.h" namespace dom_storage { @@ -24,7 +24,7 @@ class DomStorageProxy; // first access and changes are written to the backend thru the |proxy|. // Mutations originating in other processes are applied to the cache via // the ApplyMutation method. -class WEBKIT_STORAGE_EXPORT DomStorageCachedArea : +class WEBKIT_STORAGE_RENDERER_EXPORT DomStorageCachedArea : public base::RefCounted<DomStorageCachedArea> { public: DomStorageCachedArea(int64 namespace_id, const GURL& origin, diff --git a/webkit/renderer/fileapi/webfilewriter_base.h b/webkit/renderer/fileapi/webfilewriter_base.h index d091e6b..455d133 100644 --- a/webkit/renderer/fileapi/webfilewriter_base.h +++ b/webkit/renderer/fileapi/webfilewriter_base.h @@ -8,7 +8,7 @@ #include "base/platform_file.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriter.h" -#include "webkit/storage/webkit_storage_export.h" +#include "webkit/renderer/webkit_storage_renderer_export.h" namespace WebKit { class WebFileWriterClient; @@ -17,7 +17,7 @@ class WebURL; namespace fileapi { -class WEBKIT_STORAGE_EXPORT WebFileWriterBase +class WEBKIT_STORAGE_RENDERER_EXPORT WebFileWriterBase : public NON_EXPORTED_BASE(WebKit::WebFileWriter) { public: WebFileWriterBase( diff --git a/webkit/renderer/webkit_storage_renderer_export.h b/webkit/renderer/webkit_storage_renderer_export.h new file mode 100644 index 0000000..4225bc6 --- /dev/null +++ b/webkit/renderer/webkit_storage_renderer_export.h @@ -0,0 +1,29 @@ +// Copyright (c) 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. + +#ifndef WEBKIT_RENDERER_WEBKIT_STORAGE_RENDERER_EXPORT_H_ +#define WEBKIT_RENDERER_WEBKIT_STORAGE_RENDERER_EXPORT_H_ + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(WEBKIT_STORAGE_RENDERER_IMPLEMENTATION) +#define WEBKIT_STORAGE_RENDERER_EXPORT __declspec(dllexport) +#else +#define WEBKIT_STORAGE_RENDERER_EXPORT __declspec(dllimport) +#endif // defined(WEBKIT_STORAGE_RENDERER_IMPLEMENTATION) + +#else // defined(WIN32) +#if defined(WEBKIT_STORAGE_RENDERER_IMPLEMENTATION) +#define WEBKIT_STORAGE_RENDERER_EXPORT __attribute__((visibility("default"))) +#else +#define WEBKIT_STORAGE_RENDERER_EXPORT +#endif +#endif + +#else // defined(COMPONENT_BUILD) +#define WEBKIT_STORAGE_RENDERER_EXPORT +#endif + +#endif // WEBKIT_RENDERER_WEBKIT_STORAGE_RENDERER_EXPORT_H_ diff --git a/webkit/renderer/webpreferences_renderer.h b/webkit/renderer/webpreferences_renderer.h index b546578..ad7305a 100644 --- a/webkit/renderer/webpreferences_renderer.h +++ b/webkit/renderer/webpreferences_renderer.h @@ -15,8 +15,9 @@ struct WebPreferences; namespace webkit_glue { -WEBKIT_RENDERER_EXPORT void ApplyWebPreferences(const WebPreferences& prefs, - WebKit::WebView* web_view); +WEBKIT_RENDERER_EXPORT void ApplyWebPreferences( + const WebPreferences& prefs, + WebKit::WebView* web_view); } // namespace webkit_glue diff --git a/webkit/storage/webkit_storage_export.h b/webkit/storage/webkit_storage_export.h deleted file mode 100644 index ba0cc65..0000000 --- a/webkit/storage/webkit_storage_export.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef WEBKIT_STORAGE_STORAGE_EXPORT_H_ -#define WEBKIT_STORAGE_STORAGE_EXPORT_H_ - -#if defined(COMPONENT_BUILD) -#if defined(WIN32) - -#if defined(WEBKIT_STORAGE_IMPLEMENTATION) -#define WEBKIT_STORAGE_EXPORT __declspec(dllexport) -#define WEBKIT_STORAGE_EXPORT_PRIVATE __declspec(dllexport) -#else -#define WEBKIT_STORAGE_EXPORT __declspec(dllimport) -#define WEBKIT_STORAGE_EXPORT_PRIVATE __declspec(dllimport) -#endif // defined(STORAGE_IMPLEMENTATION) - -#else // defined(WIN32) -#if defined(WEBKIT_STORAGE_IMPLEMENTATION) -#define WEBKIT_STORAGE_EXPORT __attribute__((visibility("default"))) -#define WEBKIT_STORAGE_EXPORT_PRIVATE __attribute__((visibility("default"))) -#else -#define WEBKIT_STORAGE_EXPORT -#define WEBKIT_STORAGE_EXPORT_PRIVATE -#endif -#endif - -#else // defined(COMPONENT_BUILD) -#define WEBKIT_STORAGE_EXPORT -#define WEBKIT_STORAGE_EXPORT_PRIVATE -#endif - -#endif // WEBKIT_STORAGE_STORAGE_EXPORT_H_ diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp index 59afef5..405fb3d 100644 --- a/webkit/storage_browser.gyp +++ b/webkit/storage_browser.gyp @@ -21,10 +21,9 @@ '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base', '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', ], - 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], + 'defines': ['WEBKIT_STORAGE_BROWSER_IMPLEMENTATION'], 'sources': [ - # TODO(kinuko): Fix this export. - 'storage/webkit_storage_export.h', + 'browser/webkit_storage_browser_export.h', 'browser/appcache/appcache.cc', 'browser/appcache/appcache.h', 'browser/appcache/appcache_backend_impl.cc', diff --git a/webkit/storage_common.gyp b/webkit/storage_common.gyp index ab8a9ea..5a06c82 100644 --- a/webkit/storage_common.gyp +++ b/webkit/storage_common.gyp @@ -16,9 +16,9 @@ '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base', ], - 'defines': ['WEBKIT_COMMON_IMPLEMENTATION'], + 'defines': ['WEBKIT_STORAGE_COMMON_IMPLEMENTATION'], 'sources': [ - 'common/webkit_common_export.h', + 'common/webkit_storage_common_export.h', 'common/appcache/appcache_interfaces.cc', 'common/appcache/appcache_interfaces.h', 'common/blob/blob_data.cc', diff --git a/webkit/storage_renderer.gyp b/webkit/storage_renderer.gyp index 54f66c3..5c47a33 100644 --- a/webkit/storage_renderer.gyp +++ b/webkit/storage_renderer.gyp @@ -16,10 +16,9 @@ '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base', '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', ], - 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], + 'defines': ['WEBKIT_STORAGE_RENDERER_IMPLEMENTATION'], 'sources': [ - # TODO(kinuko): Fix this export. - 'storage/webkit_storage_export.h', + 'renderer/webkit_storage_renderer_export.h', 'renderer/appcache/appcache_frontend_impl.cc', 'renderer/appcache/appcache_frontend_impl.h', 'renderer/appcache/web_application_cache_host_impl.cc', |