Index: content/browser/indexed_db/indexed_db_callbacks.cc |
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc |
index 8ec899b7337334f28f8db9813bebaed259ba0869..701ed547ca63b6bfba2676d5ae0ca5defe122bc1 100644 |
--- a/content/browser/indexed_db/indexed_db_callbacks.cc |
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc |
@@ -19,7 +19,6 @@ |
#include "content/browser/indexed_db/indexed_db_context_impl.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/indexed_db_return_value.h" |
#include "content/browser/indexed_db/indexed_db_tracing.h" |
@@ -36,7 +35,6 @@ namespace content { |
namespace { |
const int32_t kNoCursor = -1; |
-const int32_t kNoDatabaseCallbacks = -1; |
const int64_t kNoTransaction = -1; |
} |
@@ -49,7 +47,6 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host, |
ipc_cursor_id_(kNoCursor), |
host_transaction_id_(kNoTransaction), |
ipc_database_id_(kNoDatabase), |
- ipc_database_callbacks_id_(kNoDatabaseCallbacks), |
data_loss_(blink::WebIDBDataLossNone), |
sent_blocked_(false) {} |
@@ -63,14 +60,12 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host, |
ipc_cursor_id_(ipc_cursor_id), |
host_transaction_id_(kNoTransaction), |
ipc_database_id_(kNoDatabase), |
- ipc_database_callbacks_id_(kNoDatabaseCallbacks), |
data_loss_(blink::WebIDBDataLossNone), |
sent_blocked_(false) {} |
IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host, |
int32_t ipc_thread_id, |
int32_t ipc_callbacks_id, |
- int32_t ipc_database_callbacks_id, |
int64_t host_transaction_id, |
const url::Origin& origin) |
: dispatcher_host_(dispatcher_host), |
@@ -80,7 +75,6 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host, |
host_transaction_id_(host_transaction_id), |
origin_(origin), |
ipc_database_id_(kNoDatabase), |
- ipc_database_callbacks_id_(ipc_database_callbacks_id), |
data_loss_(blink::WebIDBDataLossNone), |
sent_blocked_(false) {} |
@@ -107,7 +101,6 @@ void IndexedDBCallbacks::OnSuccess(const std::vector<base::string16>& value) { |
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_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
std::vector<base::string16> list; |
@@ -123,9 +116,6 @@ void IndexedDBCallbacks::OnBlocked(int64_t existing_version) { |
DCHECK(dispatcher_host_.get()); |
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_); |
if (sent_blocked_) |
@@ -153,7 +143,6 @@ void IndexedDBCallbacks::OnUpgradeNeeded( |
DCHECK_EQ(kNoCursor, ipc_cursor_id_); |
DCHECK_NE(kNoTransaction, host_transaction_id_); |
DCHECK_EQ(kNoDatabase, ipc_database_id_); |
- DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
data_loss_ = data_loss_info.status; |
dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_); |
@@ -166,7 +155,6 @@ void IndexedDBCallbacks::OnUpgradeNeeded( |
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_info.status; |
@@ -189,7 +177,6 @@ void IndexedDBCallbacks::OnSuccess( |
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); |
@@ -203,7 +190,6 @@ void IndexedDBCallbacks::OnSuccess( |
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; |
@@ -340,7 +326,6 @@ void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor, |
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_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
int32_t ipc_object_id = dispatcher_host_->Add(cursor.get()); |
@@ -379,7 +364,6 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& key, |
DCHECK_NE(kNoCursor, ipc_cursor_id_); |
DCHECK_EQ(kNoTransaction, host_transaction_id_); |
DCHECK_EQ(kNoDatabase, ipc_database_id_); |
- DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
IndexedDBCursor* idb_cursor = |
@@ -430,7 +414,6 @@ void IndexedDBCallbacks::OnSuccessWithPrefetch( |
DCHECK_NE(kNoCursor, ipc_cursor_id_); |
DCHECK_EQ(kNoTransaction, host_transaction_id_); |
DCHECK_EQ(kNoDatabase, ipc_database_id_); |
- DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
std::vector<IndexedDBKey> msg_keys; |
@@ -488,7 +471,6 @@ void IndexedDBCallbacks::OnSuccess(IndexedDBReturnValue* value) { |
} |
DCHECK_EQ(kNoTransaction, host_transaction_id_); |
DCHECK_EQ(kNoDatabase, ipc_database_id_); |
- DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
std::unique_ptr<IndexedDBMsg_CallbacksSuccessValue_Params> params( |
@@ -524,7 +506,6 @@ void IndexedDBCallbacks::OnSuccessArray( |
DCHECK_EQ(kNoTransaction, host_transaction_id_); |
DCHECK_EQ(kNoDatabase, ipc_database_id_); |
- DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
std::unique_ptr<IndexedDBMsg_CallbacksSuccessArray_Params> params( |
@@ -568,7 +549,6 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& value) { |
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_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIndexedDBKey( |
@@ -582,7 +562,6 @@ void IndexedDBCallbacks::OnSuccess(int64_t value) { |
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_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessInteger( |
@@ -596,7 +575,6 @@ void IndexedDBCallbacks::OnSuccess() { |
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_); |
DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_); |
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined( |