diff options
author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 01:30:45 +0000 |
---|---|---|
committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 01:30:45 +0000 |
commit | 3c5ed2c5747de75351c18fbf1e969eccc263d1d5 (patch) | |
tree | 75ba30df50a1f0bd4ecd90d51051b3bb057c2a51 /webkit/database/database_tracker.cc | |
parent | dad1e3bc1d2894be09c2a5bcb98708044aa1664d (diff) | |
download | chromium_src-3c5ed2c5747de75351c18fbf1e969eccc263d1d5.zip chromium_src-3c5ed2c5747de75351c18fbf1e969eccc263d1d5.tar.gz chromium_src-3c5ed2c5747de75351c18fbf1e969eccc263d1d5.tar.bz2 |
Changing the file naming scheme. Creating a directory for each origin,
and naming files according to the row ID of the respective DB in the
tracker database. Also, fixing a bug: caching the renderer process
handle in DatabaseDispatcherHost after it was set in
ResourceMessageFilter.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/385051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/database/database_tracker.cc')
-rw-r--r-- | webkit/database/database_tracker.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index c529c28..54e52d7 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -96,8 +96,16 @@ void DatabaseTracker::CloseTrackerDatabaseAndClearCaches() { FilePath DatabaseTracker::GetFullDBFilePath( const string16& origin_identifier, const string16& database_name) const { - return db_dir_.Append(FilePath::FromWStringHack(UTF16ToWide( - origin_identifier + ASCIIToUTF16("_") + database_name))); + DCHECK(!origin_identifier.empty()); + DCHECK(!database_name.empty()); + int64 id = databases_table_->GetDatabaseID( + origin_identifier, database_name); + if (id < 0) + return FilePath(); + + FilePath file_name = FilePath::FromWStringHack(Int64ToWString(id)); + return db_dir_.Append(FilePath::FromWStringHack( + UTF16ToWide(origin_identifier))).Append(file_name); } bool DatabaseTracker::LazyInit() { |