Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"
This upates calls to bound temporary objects to also use get().
While it has the same semantic equivalence to the existing code, this generally
represents a dangerous pattern - indeed, part of the whole motivation for this
change is to make this anti-pattern very visible to authors.
This change simply updates all of the call sites, to allow the "operator T*"
to be removed and preventing new instances. The existing instances will then be
reviewed for "suspicious" changes and updated to use/pass scoped_refptr<T>
rather than T*, as appropriate.
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/15984016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205560 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/indexed_db/webidbdatabase_impl.cc b/content/browser/indexed_db/webidbdatabase_impl.cc
index c74becf..1c7c3ce 100644
--- a/content/browser/indexed_db/webidbdatabase_impl.cc
+++ b/content/browser/indexed_db/webidbdatabase_impl.cc
@@ -53,7 +53,7 @@
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::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::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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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::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 @@
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::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);
}
