summaryrefslogtreecommitdiffstats
path: root/webkit/browser/database
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/browser/database')
-rw-r--r--webkit/browser/database/database_quota_client.cc54
-rw-r--r--webkit/browser/database/database_quota_client.h17
-rw-r--r--webkit/browser/database/database_tracker.cc44
-rw-r--r--webkit/browser/database/database_tracker.h16
-rw-r--r--webkit/browser/database/database_util.cc4
-rw-r--r--webkit/browser/database/database_util.h4
-rw-r--r--webkit/browser/database/databases_table.cc4
-rw-r--r--webkit/browser/database/databases_table.h4
-rw-r--r--webkit/browser/database/vfs_backend.cc4
-rw-r--r--webkit/browser/database/vfs_backend.h4
10 files changed, 77 insertions, 78 deletions
diff --git a/webkit/browser/database/database_quota_client.cc b/webkit/browser/database/database_quota_client.cc
index 08e8666..19f746a 100644
--- a/webkit/browser/database/database_quota_client.cc
+++ b/webkit/browser/database/database_quota_client.cc
@@ -18,9 +18,9 @@
#include "webkit/browser/database/database_util.h"
#include "webkit/common/database/database_identifier.h"
-using quota::QuotaClient;
+using storage::QuotaClient;
-namespace webkit_database {
+namespace storage {
namespace {
@@ -28,8 +28,8 @@ int64 GetOriginUsageOnDBThread(
DatabaseTracker* db_tracker,
const GURL& origin_url) {
OriginInfo info;
- if (db_tracker->GetOriginInfo(
- webkit_database::GetIdentifierFromOrigin(origin_url), &info))
+ if (db_tracker->GetOriginInfo(storage::GetIdentifierFromOrigin(origin_url),
+ &info))
return info.TotalSize();
return 0;
}
@@ -42,7 +42,7 @@ void GetOriginsOnDBThread(
for (std::vector<std::string>::const_iterator iter =
origin_identifiers.begin();
iter != origin_identifiers.end(); ++iter) {
- GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
+ GURL origin = storage::GetOriginFromIdentifier(*iter);
origins_ptr->insert(origin);
}
}
@@ -57,7 +57,7 @@ void GetOriginsForHostOnDBThread(
for (std::vector<std::string>::const_iterator iter =
origin_identifiers.begin();
iter != origin_identifiers.end(); ++iter) {
- GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
+ GURL origin = storage::GetOriginFromIdentifier(*iter);
if (host == net::GetHostOrSpecFromURL(origin))
origins_ptr->insert(origin);
}
@@ -80,11 +80,11 @@ void DidDeleteOriginData(
return;
}
- quota::QuotaStatusCode status;
+ storage::QuotaStatusCode status;
if (result == net::OK)
- status = quota::kQuotaStatusOk;
+ status = storage::kQuotaStatusOk;
else
- status = quota::kQuotaStatusUnknown;
+ status = storage::kQuotaStatusUnknown;
if (original_task_runner->BelongsToCurrentThread())
callback.Run(status);
@@ -119,15 +119,14 @@ void DatabaseQuotaClient::OnQuotaManagerDestroyed() {
delete this;
}
-void DatabaseQuotaClient::GetOriginUsage(
- const GURL& origin_url,
- quota::StorageType type,
- const GetUsageCallback& callback) {
+void DatabaseQuotaClient::GetOriginUsage(const GURL& origin_url,
+ storage::StorageType type,
+ const GetUsageCallback& callback) {
DCHECK(!callback.is_null());
DCHECK(db_tracker_.get());
// All databases are in the temp namespace for now.
- if (type != quota::kStorageTypeTemporary) {
+ if (type != storage::kStorageTypeTemporary) {
callback.Run(0);
return;
}
@@ -140,13 +139,13 @@ void DatabaseQuotaClient::GetOriginUsage(
}
void DatabaseQuotaClient::GetOriginsForType(
- quota::StorageType type,
+ storage::StorageType type,
const GetOriginsCallback& callback) {
DCHECK(!callback.is_null());
DCHECK(db_tracker_.get());
// All databases are in the temp namespace for now.
- if (type != quota::kStorageTypeTemporary) {
+ if (type != storage::kStorageTypeTemporary) {
callback.Run(std::set<GURL>());
return;
}
@@ -163,14 +162,14 @@ void DatabaseQuotaClient::GetOriginsForType(
}
void DatabaseQuotaClient::GetOriginsForHost(
- quota::StorageType type,
+ storage::StorageType type,
const std::string& host,
const GetOriginsCallback& callback) {
DCHECK(!callback.is_null());
DCHECK(db_tracker_.get());
// All databases are in the temp namespace for now.
- if (type != quota::kStorageTypeTemporary) {
+ if (type != storage::kStorageTypeTemporary) {
callback.Run(std::set<GURL>());
return;
}
@@ -187,16 +186,15 @@ void DatabaseQuotaClient::GetOriginsForHost(
base::Owned(origins_ptr)));
}
-void DatabaseQuotaClient::DeleteOriginData(
- const GURL& origin,
- quota::StorageType type,
- const DeletionCallback& callback) {
+void DatabaseQuotaClient::DeleteOriginData(const GURL& origin,
+ storage::StorageType type,
+ const DeletionCallback& callback) {
DCHECK(!callback.is_null());
DCHECK(db_tracker_.get());
// All databases are in the temp namespace for now, so nothing to delete.
- if (type != quota::kStorageTypeTemporary) {
- callback.Run(quota::kQuotaStatusOk);
+ if (type != storage::kStorageTypeTemporary) {
+ callback.Run(storage::kQuotaStatusOk);
return;
}
@@ -210,13 +208,13 @@ void DatabaseQuotaClient::DeleteOriginData(
FROM_HERE,
base::Bind(&DatabaseTracker::DeleteDataForOrigin,
db_tracker_,
- webkit_database::GetIdentifierFromOrigin(origin),
+ storage::GetIdentifierFromOrigin(origin),
delete_callback),
delete_callback);
}
-bool DatabaseQuotaClient::DoesSupport(quota::StorageType type) const {
- return type == quota::kStorageTypeTemporary;
+bool DatabaseQuotaClient::DoesSupport(storage::StorageType type) const {
+ return type == storage::kStorageTypeTemporary;
}
-} // namespace webkit_database
+} // namespace storage
diff --git a/webkit/browser/database/database_quota_client.h b/webkit/browser/database/database_quota_client.h
index 2c6d0aed..6770eba 100644
--- a/webkit/browser/database/database_quota_client.h
+++ b/webkit/browser/database/database_quota_client.h
@@ -14,7 +14,7 @@
#include "webkit/browser/webkit_storage_browser_export.h"
#include "webkit/common/quota/quota_types.h"
-namespace webkit_database {
+namespace storage {
class DatabaseTracker;
@@ -22,7 +22,7 @@ class DatabaseTracker;
// with the quota management system. This interface is used
// on the IO thread by the quota manager.
class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseQuotaClient
- : public quota::QuotaClient {
+ : public storage::QuotaClient {
public:
DatabaseQuotaClient(
base::MessageLoopProxy* tracker_thread,
@@ -33,17 +33,18 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseQuotaClient
virtual ID id() const OVERRIDE;
virtual void OnQuotaManagerDestroyed() OVERRIDE;
virtual void GetOriginUsage(const GURL& origin_url,
- quota::StorageType type,
+ storage::StorageType type,
const GetUsageCallback& callback) OVERRIDE;
- virtual void GetOriginsForType(quota::StorageType type,
+ virtual void GetOriginsForType(storage::StorageType type,
const GetOriginsCallback& callback) OVERRIDE;
- virtual void GetOriginsForHost(quota::StorageType type,
+ virtual void GetOriginsForHost(storage::StorageType type,
const std::string& host,
const GetOriginsCallback& callback) OVERRIDE;
virtual void DeleteOriginData(const GURL& origin,
- quota::StorageType type,
+ storage::StorageType type,
const DeletionCallback& callback) OVERRIDE;
- virtual bool DoesSupport(quota::StorageType type) const OVERRIDE;
+ virtual bool DoesSupport(storage::StorageType type) const OVERRIDE;
+
private:
scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
scoped_refptr<DatabaseTracker> db_tracker_; // only used on its thread
@@ -51,6 +52,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseQuotaClient
DISALLOW_COPY_AND_ASSIGN(DatabaseQuotaClient);
};
-} // namespace webkit_database
+} // namespace storage
#endif // WEBKIT_BROWSER_DATABASE_DATABASE_QUOTA_CLIENT_H_
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index ab1f6fd..257e250 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -27,7 +27,7 @@
#include "webkit/browser/quota/special_storage_policy.h"
#include "webkit/common/database/database_identifier.h"
-namespace webkit_database {
+namespace storage {
const base::FilePath::CharType kDatabaseDirectoryName[] =
FILE_PATH_LITERAL("databases");
@@ -82,8 +82,8 @@ OriginInfo::OriginInfo(const std::string& origin_identifier, int64 total_size)
DatabaseTracker::DatabaseTracker(
const base::FilePath& profile_path,
bool is_incognito,
- quota::SpecialStoragePolicy* special_storage_policy,
- quota::QuotaManagerProxy* quota_manager_proxy,
+ storage::SpecialStoragePolicy* special_storage_policy,
+ storage::QuotaManagerProxy* quota_manager_proxy,
base::MessageLoopProxy* db_tracker_thread)
: is_initialized_(false),
is_incognito_(is_incognito),
@@ -121,9 +121,9 @@ void DatabaseTracker::DatabaseOpened(const std::string& origin_identifier,
if (quota_manager_proxy_.get())
quota_manager_proxy_->NotifyStorageAccessed(
- quota::QuotaClient::kDatabase,
- webkit_database::GetOriginFromIdentifier(origin_identifier),
- quota::kStorageTypeTemporary);
+ storage::QuotaClient::kDatabase,
+ storage::GetOriginFromIdentifier(origin_identifier),
+ storage::kStorageTypeTemporary);
InsertOrUpdateDatabaseDetails(origin_identifier, database_name,
database_description, estimated_size);
@@ -156,9 +156,9 @@ void DatabaseTracker::DatabaseClosed(const std::string& origin_identifier,
// closed because we don't call it for read while open.
if (quota_manager_proxy_.get())
quota_manager_proxy_->NotifyStorageAccessed(
- quota::QuotaClient::kDatabase,
- webkit_database::GetOriginFromIdentifier(origin_identifier),
- quota::kStorageTypeTemporary);
+ storage::QuotaClient::kDatabase,
+ storage::GetOriginFromIdentifier(origin_identifier),
+ storage::kStorageTypeTemporary);
UpdateOpenDatabaseSizeAndNotify(origin_identifier, database_name);
if (database_connections_.RemoveConnection(origin_identifier, database_name))
@@ -361,9 +361,9 @@ bool DatabaseTracker::DeleteClosedDatabase(
if (quota_manager_proxy_.get() && db_file_size)
quota_manager_proxy_->NotifyStorageModified(
- quota::QuotaClient::kDatabase,
- webkit_database::GetOriginFromIdentifier(origin_identifier),
- quota::kStorageTypeTemporary,
+ storage::QuotaClient::kDatabase,
+ storage::GetOriginFromIdentifier(origin_identifier),
+ storage::kStorageTypeTemporary,
-db_file_size);
// Clean up the main database and invalidate the cached record.
@@ -421,9 +421,9 @@ bool DatabaseTracker::DeleteOrigin(const std::string& origin_identifier,
if (quota_manager_proxy_.get() && deleted_size) {
quota_manager_proxy_->NotifyStorageModified(
- quota::QuotaClient::kDatabase,
- webkit_database::GetOriginFromIdentifier(origin_identifier),
- quota::kStorageTypeTemporary,
+ storage::QuotaClient::kDatabase,
+ storage::GetOriginFromIdentifier(origin_identifier),
+ storage::kStorageTypeTemporary,
-deleted_size);
}
@@ -608,9 +608,9 @@ int64 DatabaseTracker::UpdateOpenDatabaseInfoAndNotify(
info->SetDatabaseSize(name, new_size);
if (quota_manager_proxy_.get())
quota_manager_proxy_->NotifyStorageModified(
- quota::QuotaClient::kDatabase,
- webkit_database::GetOriginFromIdentifier(origin_id),
- quota::kStorageTypeTemporary,
+ storage::QuotaClient::kDatabase,
+ storage::GetOriginFromIdentifier(origin_id),
+ storage::kStorageTypeTemporary,
new_size - old_size);
FOR_EACH_OBSERVER(Observer, observers_, OnDatabaseSizeChanged(
origin_id, name, new_size));
@@ -680,7 +680,7 @@ int DatabaseTracker::DeleteDataModifiedSince(
ori != origins_identifiers.end(); ++ori) {
if (special_storage_policy_.get() &&
special_storage_policy_->IsStorageProtected(
- webkit_database::GetOriginFromIdentifier(*ori))) {
+ storage::GetOriginFromIdentifier(*ori))) {
continue;
}
@@ -817,12 +817,12 @@ void DatabaseTracker::ClearSessionOnlyOrigins() {
for (std::vector<std::string>::iterator origin =
origin_identifiers.begin();
origin != origin_identifiers.end(); ++origin) {
- GURL origin_url = webkit_database::GetOriginFromIdentifier(*origin);
+ GURL origin_url = storage::GetOriginFromIdentifier(*origin);
if (!special_storage_policy_->IsStorageSessionOnly(origin_url))
continue;
if (special_storage_policy_->IsStorageProtected(origin_url))
continue;
- webkit_database::OriginInfo origin_info;
+ storage::OriginInfo origin_info;
std::vector<base::string16> databases;
GetOriginInfo(*origin, &origin_info);
origin_info.GetAllDatabaseNames(&databases);
@@ -866,4 +866,4 @@ void DatabaseTracker::SetForceKeepSessionState() {
force_keep_session_state_ = true;
}
-} // namespace webkit_database
+} // namespace storage
diff --git a/webkit/browser/database/database_tracker.h b/webkit/browser/database/database_tracker.h
index 4d4e567..f7c68ca 100644
--- a/webkit/browser/database/database_tracker.h
+++ b/webkit/browser/database/database_tracker.h
@@ -36,12 +36,12 @@ class Connection;
class MetaTable;
}
-namespace quota {
+namespace storage {
class QuotaManagerProxy;
class SpecialStoragePolicy;
}
-namespace webkit_database {
+namespace storage {
WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType
kDatabaseDirectoryName[];
@@ -103,8 +103,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker
DatabaseTracker(const base::FilePath& profile_path,
bool is_incognito,
- quota::SpecialStoragePolicy* special_storage_policy,
- quota::QuotaManagerProxy* quota_manager_proxy,
+ storage::SpecialStoragePolicy* special_storage_policy,
+ storage::QuotaManagerProxy* quota_manager_proxy,
base::MessageLoopProxy* db_tracker_thread);
void DatabaseOpened(const std::string& origin_identifier,
@@ -137,7 +137,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker
virtual bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
// Safe to call on any thread.
- quota::QuotaManagerProxy* quota_manager_proxy() const {
+ storage::QuotaManagerProxy* quota_manager_proxy() const {
return quota_manager_proxy_.get();
}
@@ -290,9 +290,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker
PendingDeletionCallbacks deletion_callbacks_;
// Apps and Extensions can have special rights.
- scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+ scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
- scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
+ scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
// The database tracker thread we're supposed to run file IO on.
scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
@@ -314,6 +314,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker
FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
};
-} // namespace webkit_database
+} // namespace storage
#endif // WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_
diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc
index 14a5455..c6d797a 100644
--- a/webkit/browser/database/database_util.cc
+++ b/webkit/browser/database/database_util.cc
@@ -10,7 +10,7 @@
#include "webkit/browser/database/vfs_backend.h"
#include "webkit/common/database/database_identifier.h"
-namespace webkit_database {
+namespace storage {
namespace {
@@ -105,4 +105,4 @@ bool DatabaseUtil::IsValidOriginIdentifier(
return GetOriginFromIdentifier(origin_identifier).is_valid();
}
-} // namespace webkit_database
+} // namespace storage
diff --git a/webkit/browser/database/database_util.h b/webkit/browser/database/database_util.h
index e6c0465..9c45e27 100644
--- a/webkit/browser/database/database_util.h
+++ b/webkit/browser/database/database_util.h
@@ -14,7 +14,7 @@ namespace base {
class FilePath;
}
-namespace webkit_database {
+namespace storage {
class DatabaseTracker;
@@ -34,6 +34,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseUtil {
static bool IsValidOriginIdentifier(const std::string& origin_identifier);
};
-} // namespace webkit_database
+} // namespace storage
#endif // WEBKIT_BROWSER_DATABASE_DATABASE_UTIL_H_
diff --git a/webkit/browser/database/databases_table.cc b/webkit/browser/database/databases_table.cc
index 747de1f..c5e239b 100644
--- a/webkit/browser/database/databases_table.cc
+++ b/webkit/browser/database/databases_table.cc
@@ -8,7 +8,7 @@
#include "base/strings/utf_string_conversions.h"
#include "sql/statement.h"
-namespace webkit_database {
+namespace storage {
DatabaseDetails::DatabaseDetails() : estimated_size(0) { }
@@ -147,4 +147,4 @@ bool DatabasesTable::DeleteOriginIdentifier(
return (delete_statement.Run() && db_->GetLastChangeCount());
}
-} // namespace webkit_database
+} // namespace storage
diff --git a/webkit/browser/database/databases_table.h b/webkit/browser/database/databases_table.h
index 4a20ec1..d128b9d 100644
--- a/webkit/browser/database/databases_table.h
+++ b/webkit/browser/database/databases_table.h
@@ -14,7 +14,7 @@ namespace sql {
class Connection;
}
-namespace webkit_database {
+namespace storage {
struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabaseDetails {
DatabaseDetails();
@@ -49,6 +49,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE DatabasesTable {
sql::Connection* db_;
};
-} // namespace webkit_database
+} // namespace storage
#endif // WEBKIT_BROWSER_DATABASE_DATABASES_TABLE_H_
diff --git a/webkit/browser/database/vfs_backend.cc b/webkit/browser/database/vfs_backend.cc
index 019e8b9..7ed0874 100644
--- a/webkit/browser/database/vfs_backend.cc
+++ b/webkit/browser/database/vfs_backend.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "third_party/sqlite/sqlite3.h"
-namespace webkit_database {
+namespace storage {
static const int kFileTypeMask = 0x00007F00;
@@ -155,4 +155,4 @@ int64 VfsBackend::GetFileSize(const base::FilePath& file_path) {
return (base::GetFileSize(file_path, &size) ? size : 0);
}
-} // namespace webkit_database
+} // namespace storage
diff --git a/webkit/browser/database/vfs_backend.h b/webkit/browser/database/vfs_backend.h
index 1fb63c9..5ac1d9a 100644
--- a/webkit/browser/database/vfs_backend.h
+++ b/webkit/browser/database/vfs_backend.h
@@ -14,7 +14,7 @@ namespace base {
class FilePath;
}
-namespace webkit_database {
+namespace storage {
class WEBKIT_STORAGE_BROWSER_EXPORT VfsBackend {
public:
@@ -37,6 +37,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT VfsBackend {
static bool OpenFileFlagsAreConsistent(int desired_flags);
};
-} // namespace webkit_database
+} // namespace storage
#endif // WEBKIT_BROWSER_DATABASE_VFS_BACKEND_H_
generated by cgit v1.1 at 2025-03-26 07:33:16 +0000