More WebSQLDatabase and QuotaManager integration.

webkit/database/database_connections.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_CONNECTIONS_H_
 #define WEBKIT_DATABASE_DATABASE_CONNECTIONS_H_
 
 #include <map>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace webkit_database {
 
 class DatabaseConnections {
  public:
   DatabaseConnections();
   ~DatabaseConnections();
 
   bool IsEmpty() const;
   bool IsDatabaseOpened(const string16& origin_identifier,
                         const string16& database_name) const;
   bool IsOriginUsed(const string16& origin_identifier) const;
-  void AddConnection(const string16& origin_identifier,
+
+  // Returns true of this is the first connection.

[kinuko, 2011/05/24 05:31:36]

nit: of -> if?

[michaeln, 2011/05/25 01:28:06]

Done.

+  bool AddConnection(const string16& origin_identifier,
                      const string16& database_name);
-  void RemoveConnection(const string16& origin_identifier,
+
+  // Returns true if the last connection was removed.
+  bool RemoveConnection(const string16& origin_identifier,
                         const string16& database_name);
+
   void RemoveAllConnections();
   void RemoveConnections(
       const DatabaseConnections& connections,
       std::vector<std::pair<string16, string16> >* closed_dbs);
 
   // Database sizes can be kept only if IsDatabaseOpened returns true.
   int64 GetOpenDatabaseSize(const string16& origin_identifier,
                             const string16& database_name) const;
   void SetOpenDatabaseSize(const string16& origin_identifier,
                            const string16& database_name,
                            int64 size);
 
   // Returns a list of the connections, <origin_id, name>.
   void ListConnections(
       std::vector<std::pair<string16, string16> > *list) const;
 
  private:
   // Mapping from name to <openCount, size>
   typedef std::map<string16, std::pair<int, int64> > DBConnections;
   typedef std::map<string16, DBConnections> OriginConnections;
   mutable OriginConnections connections_;  // mutable for GetOpenDatabaseSize
 
-  void RemoveConnectionsHelper(const string16& origin_identifier,
+  // Returns true if the last connection was removed.
+  bool RemoveConnectionsHelper(const string16& origin_identifier,
                                const string16& database_name,
                                int num_connections);
 };
 
 // A wrapper class that provides thread-safety and the
 // ability to wait until all connections have closed.
 // Intended for use in renderer processes.
 class DatabaseConnectionsWrapper
     : public base::RefCountedThreadSafe<DatabaseConnectionsWrapper> {
  public:
@@ skipping 15 matching lines @@
 
   bool waiting_for_dbs_to_close_;
   base::Lock open_connections_lock_;
   DatabaseConnections open_connections_;
   scoped_refptr<base::MessageLoopProxy> main_thread_;
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_CONNECTIONS_H_