Convert WebIDBDatabaseImpl to IndexedDBConnection

content/browser/indexed_db/indexed_db_callbacks.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 
 #include <algorithm>
 #include <vector>
 
+#include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 #include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
-#include "content/browser/indexed_db/webidbdatabase_impl.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 using WebKit::WebIDBCallbacks;
 
 namespace content {
 
 namespace {
 const int32 kNoCursor = -1;
 const int32 kNoDatabase = -1;
 const int32 kNoDatabaseCallbacks = -1;
 const int64 kNoTransaction = -1;
 }
 
 IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                                        int32 ipc_thread_id,
                                        int32 ipc_callbacks_id)
-    : did_complete_(false),
-      did_create_proxy_(false),
-      dispatcher_host_(dispatcher_host),
+    : dispatcher_host_(dispatcher_host),
       ipc_callbacks_id_(ipc_callbacks_id),
       ipc_thread_id_(ipc_thread_id),
       ipc_cursor_id_(kNoCursor),
       host_transaction_id_(kNoTransaction),
       ipc_database_id_(kNoDatabase),
       ipc_database_callbacks_id_(kNoDatabaseCallbacks) {}
 
 IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                                        int32 ipc_thread_id,
                                        int32 ipc_callbacks_id,
                                        int32 ipc_cursor_id)
-    : did_complete_(false),
-      did_create_proxy_(false),
-      dispatcher_host_(dispatcher_host),
+    : dispatcher_host_(dispatcher_host),
       ipc_callbacks_id_(ipc_callbacks_id),
       ipc_thread_id_(ipc_thread_id),
       ipc_cursor_id_(ipc_cursor_id),
       host_transaction_id_(kNoTransaction),
       ipc_database_id_(kNoDatabase),
       ipc_database_callbacks_id_(kNoDatabaseCallbacks) {}
 
 IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                                        int32 ipc_thread_id,
                                        int32 ipc_callbacks_id,
                                        int32 ipc_database_callbacks_id,
                                        int64 host_transaction_id,
                                        const GURL& origin_url)
-    : did_complete_(false),
-      did_create_proxy_(false),
-      dispatcher_host_(dispatcher_host),
+    : dispatcher_host_(dispatcher_host),
       ipc_callbacks_id_(ipc_callbacks_id),
       ipc_thread_id_(ipc_thread_id),
       ipc_cursor_id_(kNoCursor),
       host_transaction_id_(host_transaction_id),
       origin_url_(origin_url),
       ipc_database_id_(kNoDatabase),
       ipc_database_callbacks_id_(ipc_database_callbacks_id) {}
 
 IndexedDBCallbacks::~IndexedDBCallbacks() {}
 
@@ skipping 17 matching lines @@
   for (unsigned i = 0; i < value.size(); ++i)
     list.push_back(value[i]);
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessStringList(
       ipc_thread_id_, ipc_callbacks_id_, list));
   dispatcher_host_ = NULL;
 }
 
 void IndexedDBCallbacks::OnBlocked(int64 existing_version) {
   DCHECK(dispatcher_host_);
+
   DCHECK_EQ(kNoCursor, ipc_cursor_id_);
+  // No transaction/db callbacks for DeleteDatabase.
+  DCHECK_EQ(kNoTransaction == host_transaction_id_,
+            kNoDatabaseCallbacks == ipc_database_callbacks_id_);
+  DCHECK_EQ(kNoDatabase, ipc_database_id_);
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksIntBlocked(
       ipc_thread_id_, ipc_callbacks_id_, existing_version));
 }
 
 void IndexedDBCallbacks::OnUpgradeNeeded(
     int64 old_version,
-    scoped_refptr<IndexedDBDatabase> database,
+    scoped_ptr<IndexedDBConnection> connection,
     const IndexedDBDatabaseMetadata& metadata,
     WebIDBCallbacks::DataLoss data_loss) {
   DCHECK(dispatcher_host_);
+
   DCHECK_EQ(kNoCursor, ipc_cursor_id_);
-  did_create_proxy_ = true;
-
-  WebIDBDatabaseImpl* web_database =
-      new WebIDBDatabaseImpl(database, database_callbacks_);
+  DCHECK_NE(kNoTransaction, host_transaction_id_);
+  DCHECK_EQ(kNoDatabase, ipc_database_id_);
+  DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_url_);
   int32 ipc_database_id =
-      dispatcher_host_->Add(web_database, ipc_thread_id_, origin_url_);
+      dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_url_);
   ipc_database_id_ = ipc_database_id;
   IndexedDBMsg_CallbacksUpgradeNeeded_Params params;
   params.ipc_thread_id = ipc_thread_id_;
   params.ipc_callbacks_id = ipc_callbacks_id_;
   params.ipc_database_id = ipc_database_id;
   params.ipc_database_callbacks_id = ipc_database_callbacks_id_;
   params.old_version = old_version;
   params.idb_metadata = IndexedDBDispatcherHost::ConvertMetadata(metadata);
   params.data_loss = data_loss;
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksUpgradeNeeded(params));
-
-  database_callbacks_ = NULL;
 }
 
-void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBDatabase> database,
+void IndexedDBCallbacks::OnSuccess(scoped_ptr<IndexedDBConnection> connection,
                                    const IndexedDBDatabaseMetadata& metadata) {
   DCHECK(dispatcher_host_);
+
   DCHECK_EQ(kNoCursor, ipc_cursor_id_);
+  DCHECK_NE(kNoTransaction, host_transaction_id_);
+  DCHECK_NE(ipc_database_id_ == kNoDatabase, !connection);
+  DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   scoped_refptr<IndexedDBCallbacks> self(this);
 
-  WebIDBDatabaseImpl* impl =
-      did_create_proxy_ ? 0
-                        : new WebIDBDatabaseImpl(database, database_callbacks_);
-  database_callbacks_ = NULL;
-
   int32 ipc_object_id = ipc_database_id_;
-  if (ipc_object_id == kNoDatabase)
-    ipc_object_id = dispatcher_host_->Add(impl, ipc_thread_id_, origin_url_);
+  if (ipc_object_id == kNoDatabase) {
+    ipc_object_id = dispatcher_host_->Add(
+        connection.release(), ipc_thread_id_, origin_url_);
+  }
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIDBDatabase(
       ipc_thread_id_,
       ipc_callbacks_id_,
       ipc_database_callbacks_id_,
       ipc_object_id,
       IndexedDBDispatcherHost::ConvertMetadata(metadata)));
   dispatcher_host_ = NULL;
 }
 
-void IndexedDBCallbacks::SetDatabaseCallbacks(
-    scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks) {
-  database_callbacks_ = database_callbacks;
-}
-
 void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
                                    const IndexedDBKey& key,
                                    const IndexedDBKey& primary_key,
                                    std::vector<char>* value) {
   DCHECK(dispatcher_host_);
 
+  DCHECK_EQ(kNoCursor, ipc_cursor_id_);
   DCHECK_EQ(kNoTransaction, host_transaction_id_);
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   int32 ipc_object_id = dispatcher_host_->Add(cursor);
   IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
   params.ipc_thread_id = ipc_thread_id_;
   params.ipc_callbacks_id = ipc_callbacks_id_;
   params.ipc_cursor_id = ipc_object_id;
   params.key = key;
@@ skipping 91 matching lines @@
       // TODO(alecflett): Avoid a copy here.
       value_copy,
       key,
       key_path));
   dispatcher_host_ = NULL;
 }
 
 void IndexedDBCallbacks::OnSuccess(std::vector<char>* value) {
   DCHECK(dispatcher_host_);
 
+  DCHECK(kNoCursor == ipc_cursor_id_ || value == NULL);
   DCHECK_EQ(kNoTransaction, host_transaction_id_);
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   std::vector<char> value_copy;
   if (value && !value->empty())
     std::swap(value_copy, *value);
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessValue(
       ipc_thread_id_,
       ipc_callbacks_id_,
@@ skipping 24 matching lines @@
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessInteger(
       ipc_thread_id_, ipc_callbacks_id_, value));
   dispatcher_host_ = NULL;
 }
 
 void IndexedDBCallbacks::OnSuccess() {
   DCHECK(dispatcher_host_);
 
+  DCHECK_EQ(kNoCursor, ipc_cursor_id_);
   DCHECK_EQ(kNoTransaction, host_transaction_id_);
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined(
       ipc_thread_id_, ipc_callbacks_id_));
   dispatcher_host_ = NULL;
 }
 
 }  // namespace content