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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/indexed_db/indexed_db_callbacks.cc

Issue 2109273002: IndexedDB: Created IndexedDBDataLossInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initializing data loss in IndexedDBBackingStore::Open Created 4 years, 5 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 | « content/browser/indexed_db/indexed_db_callbacks.h ('k') | content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.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_callbacks.cc
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc
index 6c541b7d5d88d0ba2a54d5441037ef561c101f3e..353fa452ae6e728f8b8cb1c81299f416f9464882 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <algorithm>
+#include <utility>
#include "base/metrics/histogram.h"
#include "base/strings/utf_string_conversions.h"
@@ -49,7 +50,6 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
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,
@@ -63,7 +63,6 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
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,
@@ -80,7 +79,6 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
origin_(origin),
ipc_database_id_(kNoDatabase),
ipc_database_callbacks_id_(ipc_database_callbacks_id),
- data_loss_(blink::WebIDBDataLossNone),
sent_blocked_(false) {}
IndexedDBCallbacks::~IndexedDBCallbacks() {}
@@ -107,7 +105,7 @@ void IndexedDBCallbacks::OnSuccess(const std::vector<base::string16>& 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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
std::vector<base::string16> list;
for (unsigned i = 0; i < value.size(); ++i)
@@ -142,11 +140,8 @@ void IndexedDBCallbacks::OnBlocked(int64_t existing_version) {
}
}
-void IndexedDBCallbacks::OnDataLoss(blink::WebIDBDataLoss data_loss,
- std::string data_loss_message) {
- DCHECK_NE(blink::WebIDBDataLossNone, data_loss);
- data_loss_ = data_loss;
- data_loss_message_ = data_loss_message;
+void IndexedDBCallbacks::OnDataLoss(const IndexedDBDataLossInfo& info) {
+ data_loss_info_ = info;
}
void IndexedDBCallbacks::OnUpgradeNeeded(
@@ -173,8 +168,8 @@ void IndexedDBCallbacks::OnUpgradeNeeded(
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_;
- params.data_loss_message = data_loss_message_;
+ params.data_loss = data_loss_info_.status;
+ params.data_loss_message = data_loss_info_.message;
dispatcher_host_->Send(new IndexedDBMsg_CallbacksUpgradeNeeded(params));
if (!connection_open_start_time_.is_null()) {
@@ -345,7 +340,7 @@ void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
int32_t ipc_object_id = dispatcher_host_->Add(cursor.get());
std::unique_ptr<IndexedDBMsg_CallbacksSuccessIDBCursor_Params> params(
@@ -384,7 +379,7 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& key,
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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
IndexedDBCursor* idb_cursor =
dispatcher_host_->GetCursorFromId(ipc_cursor_id_);
@@ -435,7 +430,7 @@ void IndexedDBCallbacks::OnSuccessWithPrefetch(
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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
std::vector<IndexedDBKey> msg_keys;
std::vector<IndexedDBKey> msg_primary_keys;
@@ -493,7 +488,7 @@ 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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
std::unique_ptr<IndexedDBMsg_CallbacksSuccessValue_Params> params(
new IndexedDBMsg_CallbacksSuccessValue_Params());
@@ -529,7 +524,7 @@ 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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
std::unique_ptr<IndexedDBMsg_CallbacksSuccessArray_Params> params(
new IndexedDBMsg_CallbacksSuccessArray_Params());
@@ -573,7 +568,7 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& 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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIndexedDBKey(
ipc_thread_id_, ipc_callbacks_id_, value));
@@ -587,7 +582,7 @@ void IndexedDBCallbacks::OnSuccess(int64_t 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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessInteger(
ipc_thread_id_, ipc_callbacks_id_, value));
@@ -601,7 +596,7 @@ void IndexedDBCallbacks::OnSuccess() {
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_);
+ DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_info_.status);
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined(
ipc_thread_id_, ipc_callbacks_id_));
« no previous file with comments | « content/browser/indexed_db/indexed_db_callbacks.h ('k') | content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698