| Index: content/browser/indexed_db/webidbdatabase_impl.cc
|
| diff --git a/content/browser/indexed_db/webidbdatabase_impl.cc b/content/browser/indexed_db/webidbdatabase_impl.cc
|
| index c74becfac6e67c944dbef3ae8a0c81bfd818fb06..1c7c3ce3a6206be5c20d92ff06e9db8c4eb9b967 100644
|
| --- a/content/browser/indexed_db/webidbdatabase_impl.cc
|
| +++ b/content/browser/indexed_db/webidbdatabase_impl.cc
|
| @@ -53,7 +53,7 @@ void WebIDBDatabaseImpl::createTransaction(
|
| IndexedDBDatabaseCallbacks* /*callbacks*/,
|
| const std::vector<int64>& object_store_ids,
|
| unsigned short mode) {
|
| - if (!database_callbacks_)
|
| + if (!database_callbacks_.get())
|
| return;
|
| database_backend_->CreateTransaction(
|
| id, database_callbacks_.get(), object_store_ids, mode);
|
| @@ -62,14 +62,14 @@ void WebIDBDatabaseImpl::createTransaction(
|
| void WebIDBDatabaseImpl::close() {
|
| // Use the callbacks passed in to the constructor so that the backend in
|
| // multi-process chromium knows which database connection is closing.
|
| - if (!database_callbacks_)
|
| + if (!database_callbacks_.get())
|
| return;
|
| database_backend_->Close(database_callbacks_);
|
| database_callbacks_ = NULL;
|
| }
|
|
|
| void WebIDBDatabaseImpl::forceClose() {
|
| - if (!database_callbacks_)
|
| + if (!database_callbacks_.get())
|
| return;
|
| database_backend_->Close(database_callbacks_);
|
| database_callbacks_->OnForcedClose();
|
| @@ -77,18 +77,18 @@ void WebIDBDatabaseImpl::forceClose() {
|
| }
|
|
|
| void WebIDBDatabaseImpl::abort(long long transaction_id) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Abort(transaction_id);
|
| }
|
|
|
| void WebIDBDatabaseImpl::abort(long long transaction_id,
|
| const WebIDBDatabaseError& error) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Abort(transaction_id, IndexedDBDatabaseError(error));
|
| }
|
|
|
| void WebIDBDatabaseImpl::commit(long long transaction_id) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Commit(transaction_id);
|
| }
|
|
|
| @@ -100,7 +100,7 @@ void WebIDBDatabaseImpl::openCursor(long long transaction_id,
|
| bool key_only,
|
| WebKit::WebIDBDatabase::TaskType task_type,
|
| IndexedDBCallbacksBase* callbacks) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->OpenCursor(
|
| transaction_id,
|
| object_store_id,
|
| @@ -117,7 +117,7 @@ void WebIDBDatabaseImpl::count(long long transaction_id,
|
| long long index_id,
|
| const IndexedDBKeyRange& key_range,
|
| IndexedDBCallbacksBase* callbacks) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Count(transaction_id,
|
| object_store_id,
|
| index_id,
|
| @@ -131,7 +131,7 @@ void WebIDBDatabaseImpl::get(long long transaction_id,
|
| const IndexedDBKeyRange& key_range,
|
| bool key_only,
|
| IndexedDBCallbacksBase* callbacks) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Get(transaction_id,
|
| object_store_id,
|
| index_id,
|
| @@ -148,7 +148,7 @@ void WebIDBDatabaseImpl::put(long long transaction_id,
|
| IndexedDBCallbacksBase* callbacks,
|
| const std::vector<int64>& index_ids,
|
| const std::vector<IndexKeys>& index_keys) {
|
| - if (!database_backend_)
|
| + if (!database_backend_.get())
|
| return;
|
|
|
| DCHECK_EQ(index_ids.size(), index_keys.size());
|
| @@ -169,7 +169,7 @@ void WebIDBDatabaseImpl::setIndexKeys(
|
| const IndexedDBKey& primary_key,
|
| const std::vector<int64>& index_ids,
|
| const std::vector<IndexKeys>& index_keys) {
|
| - if (!database_backend_)
|
| + if (!database_backend_.get())
|
| return;
|
|
|
| DCHECK_EQ(index_ids.size(), index_keys.size());
|
| @@ -185,7 +185,7 @@ void WebIDBDatabaseImpl::setIndexesReady(
|
| long long transaction_id,
|
| long long object_store_id,
|
| const std::vector<int64>& web_index_ids) {
|
| - if (!database_backend_)
|
| + if (!database_backend_.get())
|
| return;
|
|
|
| std::vector<int64> index_ids(web_index_ids.size());
|
| @@ -199,7 +199,7 @@ void WebIDBDatabaseImpl::deleteRange(long long transaction_id,
|
| long long object_store_id,
|
| const IndexedDBKeyRange& key_range,
|
| IndexedDBCallbacksBase* callbacks) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->DeleteRange(
|
| transaction_id,
|
| object_store_id,
|
| @@ -210,7 +210,7 @@ void WebIDBDatabaseImpl::deleteRange(long long transaction_id,
|
| void WebIDBDatabaseImpl::clear(long long transaction_id,
|
| long long object_store_id,
|
| IndexedDBCallbacksBase* callbacks) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->Clear(transaction_id,
|
| object_store_id,
|
| IndexedDBCallbacksWrapper::Create(callbacks));
|
| @@ -223,7 +223,7 @@ void WebIDBDatabaseImpl::createIndex(long long transaction_id,
|
| const IndexedDBKeyPath& key_path,
|
| bool unique,
|
| bool multi_entry) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->CreateIndex(transaction_id,
|
| object_store_id,
|
| index_id,
|
| @@ -236,7 +236,7 @@ void WebIDBDatabaseImpl::createIndex(long long transaction_id,
|
| void WebIDBDatabaseImpl::deleteIndex(long long transaction_id,
|
| long long object_store_id,
|
| long long index_id) {
|
| - if (database_backend_)
|
| + if (database_backend_.get())
|
| database_backend_->DeleteIndex(transaction_id, object_store_id, index_id);
|
| }
|
|
|
|
|