Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1367)

Unified Diff: content/browser/indexed_db/indexed_db_database.h

Issue 198223002: Added IndexedDBPendingConnection to group up a bunch of parameters that get (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge out Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/indexed_db/indexed_db_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/indexed_db/indexed_db_database.h
diff --git a/content/browser/indexed_db/indexed_db_database.h b/content/browser/indexed_db/indexed_db_database.h
index 902d3558dbca9a99c6e75f84788a96a3f5e34cf6..8c766eb9779b162e1a05268b6701e5ad12ce2304 100644
--- a/content/browser/indexed_db/indexed_db_database.h
+++ b/content/browser/indexed_db/indexed_db_database.h
@@ -17,6 +17,7 @@
#include "content/browser/indexed_db/indexed_db_backing_store.h"
#include "content/browser/indexed_db/indexed_db_callbacks.h"
#include "content/browser/indexed_db/indexed_db_metadata.h"
+#include "content/browser/indexed_db/indexed_db_pending_connection.h"
#include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
#include "content/browser/indexed_db/list_set.h"
#include "url/gurl.h"
@@ -74,11 +75,7 @@ class CONTENT_EXPORT IndexedDBDatabase
int64 new_max_index_id);
void RemoveIndex(int64 object_store_id, int64 index_id);
- void OpenConnection(
- scoped_refptr<IndexedDBCallbacks> callbacks,
- scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
- int64 transaction_id,
- int64 version);
+ void OpenConnection(const IndexedDBPendingConnection& connection);
void DeleteDatabase(scoped_refptr<IndexedDBCallbacks> callbacks);
const IndexedDBDatabaseMetadata& metadata() const { return metadata_; }
@@ -256,6 +253,10 @@ class CONTENT_EXPORT IndexedDBDatabase
bool IsDeleteDatabaseBlocked() const;
void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacks> callbacks);
+ scoped_ptr<IndexedDBConnection> CreateConnection(
+ scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
+ int child_process_id);
+
IndexedDBTransaction* GetTransaction(int64 transaction_id) const;
bool ValidateObjectStoreId(int64 object_store_id) const;
@@ -270,8 +271,6 @@ class CONTENT_EXPORT IndexedDBDatabase
IndexedDBDatabaseMetadata metadata_;
const Identifier identifier_;
- // This might not need to be a scoped_refptr since the factory's lifetime is
- // that of the page group, but it's better to be conservitive than sorry.
scoped_refptr<IndexedDBFactory> factory_;
IndexedDBTransactionCoordinator transaction_coordinator_;
@@ -279,8 +278,7 @@ class CONTENT_EXPORT IndexedDBDatabase
typedef std::map<int64, IndexedDBTransaction*> TransactionMap;
TransactionMap transactions_;
- class PendingOpenCall;
- typedef std::list<PendingOpenCall*> PendingOpenCallList;
+ typedef std::list<IndexedDBPendingConnection> PendingOpenCallList;
PendingOpenCallList pending_open_calls_;
class PendingUpgradeCall;
« no previous file with comments | « no previous file | content/browser/indexed_db/indexed_db_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698