More WebSQLDatabase and QuotaManager integration.

webkit/database/database_tracker.h

 // Copyright (c) 2011 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_DATABASE_DATABASE_TRACKER_H_
 #define WEBKIT_DATABASE_DATABASE_TRACKER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 22 matching lines @@
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
 namespace webkit_database {
 
 extern const FilePath::CharType kDatabaseDirectoryName[];
 extern const FilePath::CharType kTrackerDatabaseFileName[];
 
 class DatabasesTable;
-class QuotaTable;
+//class QuotaTable;
 
 // This class is used to store information about all databases in an origin.
 class OriginInfo {
  public:
   OriginInfo();
   OriginInfo(const OriginInfo& origin_info);
   ~OriginInfo();
 
   const string16& GetOrigin() const { return origin_; }
   int64 TotalSize() const { return total_size_; }
-  int64 Quota() const { return quota_; }
+  //int64 Quota() const { return quota_; }
   void GetAllDatabaseNames(std::vector<string16>* databases) const;
   int64 GetDatabaseSize(const string16& database_name) const;
   string16 GetDatabaseDescription(const string16& database_name) const;
 
  protected:
   typedef std::map<string16, std::pair<int64, string16> > DatabaseInfoMap;
 
-  OriginInfo(const string16& origin, int64 total_size, int64 quota);
+  OriginInfo(const string16& origin, int64 total_size); //, int64 quota);
 
   string16 origin_;
   int64 total_size_;
-  int64 quota_;
+  //int64 quota_;
   DatabaseInfoMap database_info_;
 };
 
-// This class manages the main database, and keeps track of per origin quotas.
+// This class manages the main database and keeps track of open databases.
 //
 // The data in this class is not thread-safe, so all methods of this class
 // should be called on the same thread. The only exceptions are the ctor(),
 // the dtor() and the database_directory() and quota_manager_proxy() getters.
 //
 // Furthermore, some methods of this class have to read/write data from/to
 // 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 DatabaseTracker
@@ skipping 37 matching lines @@
   FilePath GetFullDBFilePath(const string16& origin_identifier,
                              const string16& database_name);
 
   // virtual for unittesting only
   virtual bool GetOriginInfo(const string16& origin_id, OriginInfo* info);
   virtual bool GetAllOriginIdentifiers(std::vector<string16>* origin_ids);
   virtual bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
 
   // TODO(michaeln): remove quota related stuff when quota manager
   // integration is complete
-  void SetOriginQuota(const string16& origin_identifier, int64 new_quota);
-  int64 GetDefaultQuota() { return default_quota_; }
-  void SetDefaultQuota(int64 quota);  // for testing
+  //void SetOriginQuota(const string16& origin_identifier, int64 new_quota);
+  //int64 GetDefaultQuota() { return default_quota_; }
+  //void SetDefaultQuota(int64 quota);  // for testing
 
   // Safe to call on any thread.
   quota::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
   }
 
   bool IsDatabaseScheduledForDeletion(const string16& origin_identifier,
                                       const string16& database_name);
 
   // Deletes a single database. Returns net::OK on success, net::FAILED on
@@ skipping 37 matching lines @@
   friend class base::RefCountedThreadSafe<DatabaseTracker>;
   friend class MockDatabaseTracker;  // for testing
 
   typedef std::map<string16, std::set<string16> > DatabaseSet;
   typedef std::map<net::CompletionCallback*, DatabaseSet> PendingCompletionMap;
   typedef std::map<string16, base::PlatformFile> FileHandlesMap;
   typedef std::map<string16, string16> OriginDirectoriesMap;
 
   class CachedOriginInfo : public OriginInfo {
    public:
-    CachedOriginInfo() : OriginInfo(string16(), 0, 0) {}
+    CachedOriginInfo() : OriginInfo(string16(), 0) {}
     void SetOrigin(const string16& origin) { origin_ = origin; }
-    void SetQuota(int64 new_quota) { quota_ = new_quota; }
+    //void SetQuota(int64 new_quota) { quota_ = new_quota; }
     void SetDatabaseSize(const string16& database_name, int64 new_size) {
       int64 old_size = 0;
       if (database_info_.find(database_name) != database_info_.end())
         old_size = database_info_[database_name].first;
       database_info_[database_name].first = new_size;
       if (new_size != old_size)
         total_size_ += new_size - old_size;
     }
     void SetDatabaseDescription(const string16& database_name,
                                 const string16& description) {
@@ skipping 15 matching lines @@
   void InsertOrUpdateDatabaseDetails(const string16& origin_identifier,
                                      const string16& database_name,
                                      const string16& database_details,
                                      int64 estimated_size);
 
   void ClearAllCachedOriginInfo();
   CachedOriginInfo* GetCachedOriginInfo(const string16& origin_identifier);
 
   int64 GetDBFileSize(const string16& origin_identifier,
                       const string16& database_name);
+  int64 SeedOpenDatabaseSize(const string16& origin_identifier,
+                             const string16& database_name);
+  int64 UpdateOpenDatabaseSizeAndNotify(const string16& origin_identifier,
+                                        const string16& database_name);
 
-  int64 GetOriginSpaceAvailable(const string16& origin_identifier);
-
-  int64 UpdateCachedDatabaseFileSize(const string16& origin_identifier,
-                                     const string16& database_name);
   void ScheduleDatabaseForDeletion(const string16& origin_identifier,
                                    const string16& database_name);
   // Schedule a set of open databases for deletion. If non-null, callback is
   // invoked upon completion.
   void ScheduleDatabasesForDeletion(const DatabaseSet& databases,
                                     net::CompletionCallback* callback);
 
   // Returns the directory where all DB files for the given origin are stored.
   string16 GetOriginDirectory(const string16& origin_identifier);
 
   bool is_initialized_;
   const bool is_incognito_;
   bool shutting_down_;
   const FilePath profile_path_;
   const FilePath db_dir_;
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<DatabasesTable> databases_table_;
-  scoped_ptr<QuotaTable> quota_table_;
+  //scoped_ptr<QuotaTable> quota_table_;
   scoped_ptr<sql::MetaTable> meta_table_;
   ObserverList<Observer, true> observers_;
   std::map<string16, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;
 
   // The set of databases that should be deleted but are still opened
   DatabaseSet dbs_to_be_deleted_;
   PendingCompletionMap deletion_callbacks_;
 
   // Default quota for all origins; changed only by tests
-  int64 default_quota_;
+  //int64 default_quota_;
 
   // Apps and Extensions can have special rights.
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
 
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
 
   // When in incognito mode, store a DELETE_ON_CLOSE handle to each
   // main DB and journal file that was accessed. When the incognito profile
   // goes away (or when the browser crashes), all these handles will be
   // closed, and the files will be deleted.
   FileHandlesMap incognito_file_handles_;
 
   // In a non-incognito profile, all DBs in an origin are stored in a directory
   // named after the origin. In an incognito profile though, we do not want the
   // directory structure to reveal the origins visited by the user (in case the
   // browser process crashes and those directories are not deleted). So we use
   // this map to assign directory names that do not reveal this information.
   OriginDirectoriesMap incognito_origin_directories_;
   int incognito_origin_directories_generator_;
 
   FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_TRACKER_H_